|
|
@@ -88,7 +88,7 @@ class Deliver extends Backend
|
|
|
$limit = input('limit');
|
|
|
$total = $large->name($userInfo['company'].'_'.'qcode_large')->where('l_status',0)->where($where)->whereIn('bach_id',$bach_id)->count();
|
|
|
$large_list = $large->name($userInfo['company'].'_'.'qcode_large')
|
|
|
- ->order('creat_time',$order)
|
|
|
+ ->order('create_time')
|
|
|
->where($where)
|
|
|
->where('l_status',0)
|
|
|
->whereIn('bach_id',$bach_id)
|
|
|
@@ -220,7 +220,7 @@ class Deliver extends Backend
|
|
|
'large_num' => $lager_num,
|
|
|
'small_num' => $n,
|
|
|
'status' => 0,
|
|
|
- 'num' => $bachDetail['s_weight'],
|
|
|
+ 'num' => $bachDetail['box_num'],
|
|
|
'bach_num' => $bachDetail['bach_num'],
|
|
|
'mater_type' => $mater_type,
|
|
|
'note' => '',
|
|
|
@@ -660,7 +660,6 @@ class Deliver extends Backend
|
|
|
$data[$k] = $export->where('_id',$v)->find();
|
|
|
$large_str = explode(',',$data[$k]['large_str']);
|
|
|
$large_list = $large->name($userinfo['company'].'_'.'qcode_large')->whereIn('_id',$large_str)->select();
|
|
|
-
|
|
|
$large_num = $large_weight = 0;
|
|
|
foreach ($large_list as $value){
|
|
|
$large_num = $large_num + $value['l_num'];
|