|
@@ -289,13 +289,16 @@ class BoxService extends Service
|
|
|
|
|
|
return [true, ''];
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
- * 根据发货单包装(恒诚塑业不需要)
|
|
|
+ * 根据发货单包装(恒诚塑业不需要 如果有调用 直接返回)
|
|
|
* @param $data
|
|
|
* @return array
|
|
|
*/
|
|
|
public function transportBoxIn($data)
|
|
|
- {return [true,''];
|
|
|
+ {
|
|
|
+ return [true,''];
|
|
|
+
|
|
|
// $param = [
|
|
|
// [
|
|
|
// 'order_no' => 'XD202309000155',
|
|
@@ -331,7 +334,6 @@ class BoxService extends Service
|
|
|
// 'transport_no' => '123443212',
|
|
|
// ];
|
|
|
|
|
|
-
|
|
|
$param = $data['params'];
|
|
|
$shipment_order_no = $data['transport_no'];
|
|
|
$sale_order_nos = [];
|
|
@@ -383,7 +385,6 @@ class BoxService extends Service
|
|
|
}
|
|
|
|
|
|
protected function getKey($data){
|
|
|
-
|
|
|
return $data['product_no'].'_'.$data['technology_material'].'_'.$data['technology_name'].'_'.$data['wood_name'].'_'.$data['process_mark'];
|
|
|
}
|
|
|
|
|
@@ -571,14 +572,12 @@ class BoxService extends Service
|
|
|
return [true,$list];
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 通过包装单获取包装详情
|
|
|
* @param $data
|
|
|
* @return array
|
|
|
*/
|
|
|
public function boxOrderDetailByOrderNo($data){
|
|
|
-
|
|
|
$order_nos = $data['order_nos'];
|
|
|
$order_nos = array_unique($order_nos);
|
|
|
$list = Box::where('del_time',0)->wherein('order_no',$order_nos)->select('order_no','out_order_no','top_order_no','shipment_order_no as transport_no')->get()->toArray();
|