|
@@ -1032,7 +1032,7 @@ class BoxService extends Service
|
|
|
->get()->toArray();
|
|
|
$detail_list = [];
|
|
|
foreach ($list as $v){
|
|
|
- if(! empty($v['transport_no'])) return [false, "包装单:" . $v['transport_no'] . "已在发货单(" . $v['transport_no'] .")中发出!"];
|
|
|
+ if(! empty($v['transport_no'])) return [false, "包装单:" . $v['transport_no'] . "已在发货单(" . $v['transport_no'] .")中发出!"];
|
|
|
$model = new BoxDetail(['channel'=>$v['top_order_no']]);
|
|
|
$detail_list = array_merge($detail_list,$model->where('order_no',$v['order_no'])->where('top_order_no',$v['top_order_no'])->get()->toArray());
|
|
|
}
|