|
@@ -135,9 +135,26 @@ class FyyOrderService extends Service
|
|
$model->whereColumn('order_quantity', '>', 'production_quantity');
|
|
$model->whereColumn('order_quantity', '>', 'production_quantity');
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
$list = $this->limit($model,'',$data);
|
|
$list = $this->fillData($list);
|
|
$list = $this->fillData($list);
|
|
|
|
+ if(isset($data['box_type'])&&$data['box_type'] == 1){
|
|
|
|
+ $out_order_nos = [];
|
|
|
|
+ foreach ($list['data'] as $v){
|
|
|
|
+ $out_order_nos[] = $v['out_order_no'];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ $transport_nos = Box::wherein('out_order_no',$out_order_nos)->select('shipment_order_no','out_order_no')->get()->toArray();
|
|
|
|
+ $transport_key_nos = [];
|
|
|
|
+ foreach ($transport_nos as $v){
|
|
|
|
+ if(!isset($transport_key_nos[$v['out_order_no']])) $transport_key_nos[$v['out_order_no']] = [];
|
|
|
|
+ $transport_key_nos[$v['out_order_no']][] = $v['shipment_order_no'];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ foreach ($list['data'] as &$v){
|
|
|
|
+ if(isset($transport_key_nos[$v['out_order_no']])) $v['shipment_order_no'] = implode(',',$transport_key_nos[$v['out_order_no']]);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
return [true, $list];
|
|
return [true, $list];
|
|
}
|
|
}
|