|
|
@@ -548,10 +548,16 @@ class BoxService extends Service
|
|
|
|
|
|
public function boxOrderGroup($data){
|
|
|
$list = new Box();
|
|
|
- if(!isset($data['top_order_no'])&&!isset($data['transport_no'])) return [false,'销售单或发货单必选一个'];
|
|
|
+ if(empty($data['top_order_no'])&&empty($data['transport_no'])) return [false,'销售单或发货单必选一个'];
|
|
|
if(isset($data['top_order_no'])&&!empty($data['top_order_no'])) $list = $list->wherein('top_order_no',$data['top_order_no']);
|
|
|
- if(isset($data['transport_no'])&&!empty($data['transport_no'])) $list = $list->wherein('shipment_order_no',$data['transport_no']);
|
|
|
- $list = $list->select('top_order_no','order_no','crt_time')->where('del_time',0)->get()->toArray();
|
|
|
+ if(!empty($data['transport_no'])) {
|
|
|
+ if(is_array($data['transport_no'])){
|
|
|
+ $list = $list->wherein('shipment_order_no',$data['transport_no']);
|
|
|
+ }else{
|
|
|
+ $list = $list->where('shipment_order_no','Like','%'. $data['transport_no'] . '%');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $list = $list->select('top_order_no','order_no','crt_time','shipment_order_no')->where('del_time',0)->get()->toArray();
|
|
|
|
|
|
|
|
|
return [true,$list];
|
|
|
@@ -728,7 +734,7 @@ class BoxService extends Service
|
|
|
if(empty($data['shipment_order_no'])) return [false, '请输入发货单号'];
|
|
|
$model = DB::table('box_detail')->where('del_time',0)
|
|
|
->where('shipment_order_no','LIKE', '%'.$data['shipment_order_no'].'%')
|
|
|
- ->select('order_no','crt_time');
|
|
|
+ ->select('order_no','crt_time','shipment_order_no');
|
|
|
|
|
|
$return = [];
|
|
|
$result = $model->get()->toArray();
|
|
|
@@ -736,6 +742,7 @@ class BoxService extends Service
|
|
|
foreach ($result as $value){
|
|
|
$return[$value->order_no] = [
|
|
|
'order_no' => $value->order_no,
|
|
|
+ 'shipment_order_no' => $value->shipment_order_no,
|
|
|
'crt_time' => date("Y-m-d H:i:s",$value->crt_time)
|
|
|
];
|
|
|
}
|
cqpCow