|
|
@@ -66,12 +66,18 @@ class DwyService extends Service
|
|
|
}
|
|
|
}
|
|
|
//补全数据
|
|
|
-// $data = $this->setBoxFake($new_data);
|
|
|
+ if($dv === 'a6a672c3e458bed2'){
|
|
|
+ $new_data = $this->setBoxFake($new_data);
|
|
|
+ list($lind_bind,$lead_out) = $this->setNewData1($old_data,$new_data);
|
|
|
+ }else{
|
|
|
+ list($lind_bind,$lead_out) = $this->setNewData($old_data,$new_data);
|
|
|
+ }
|
|
|
+//
|
|
|
//把数据拼回去
|
|
|
// var_dump($data);die;
|
|
|
// var_dump($old_data);die;
|
|
|
|
|
|
- list($lind_bind,$lead_out) = $this->setNewData($old_data,$new_data);
|
|
|
+
|
|
|
// var_dump($lind_bind);
|
|
|
// var_dump($lead_out);die;
|
|
|
// die('ddd');
|
|
|
@@ -118,6 +124,55 @@ class DwyService extends Service
|
|
|
$lind_bind = $old_data['lead_bind'];
|
|
|
$lind_bind_key_list = [];
|
|
|
foreach ($lind_bind['material_list'] as &$l){
|
|
|
+// unset($l['brand_qr_code_list']);
|
|
|
+// $l['qty'] = $l['fake_qty'];
|
|
|
+// $l['brand_qr_code_list'] = $this->getValues( $code_key_data[$l['material_code']],$l['qty']);
|
|
|
+ $lind_bind_key_list[$l['order_item_id']] = [
|
|
|
+ 'product_code' => $l['product_code'],
|
|
|
+ 'product_code_show' => $l['product_code_show'],
|
|
|
+ 'process_title' => $l['process_title'],
|
|
|
+ 'color' => $l['color'],
|
|
|
+ 'process_title_two' => $l['process_title_two'],
|
|
|
+ 'color_two' => $l['color_two'],
|
|
|
+ ];
|
|
|
+ unset($l['fake_qty']);
|
|
|
+ }
|
|
|
+
|
|
|
+ $lead_out = $old_data['lead_out']['brand_out_stock_list'];
|
|
|
+ foreach ($lead_out as &$ll){
|
|
|
+ foreach ($ll['brand_out_stock_dtl'] as &$lll){
|
|
|
+// unset($lll['brand_qr_code_list']);
|
|
|
+// $lll['qty'] = $ll['brand_out_stock_dtl'][0]['fake_qty'];
|
|
|
+// $lll['qty'] = $lll['fake_qty'];
|
|
|
+// unset($lll['fake_qty']);
|
|
|
+
|
|
|
+// var_dump($data[$ll['send_box_code']]);
|
|
|
+// $lll['brand_qr_code_list'] = implode(',',$data[$ll['send_box_code']]['detail']);
|
|
|
+// $lll['brand_qr_code_list'] = implode(',',$this->getValues( $data[$ll['send_box_code']]['detail'],$lll['qty']));;
|
|
|
+ $lll['product_code'] = $lind_bind_key_list[$lll['bus_no']]['product_code'] ?? '';
|
|
|
+ $lll['product_code_show'] = $lind_bind_key_list[$lll['bus_no']]['product_code_show'] ?? '';
|
|
|
+ $lll['process_title'] = $lind_bind_key_list[$lll['bus_no']]['process_title'] ?? '';
|
|
|
+ $lll['color'] = $lind_bind_key_list[$lll['bus_no']]['color'] ?? '';
|
|
|
+ $lll['process_title_two'] = $lind_bind_key_list[$lll['bus_no']]['process_title_two'] ?? '';
|
|
|
+ $lll['color_two'] = $lind_bind_key_list[$lll['bus_no']]['color_two'] ?? '';
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ file_put_contents('1.txt',json_encode(['lind_bind'=>$lind_bind,'lead_out'=>['brand_out_stock_list'=>$lead_out]]));
|
|
|
+// var_dump($lind_bind);
|
|
|
+// var_dump($lead_out);die;
|
|
|
+ return [$lind_bind,['brand_out_stock_list'=>$lead_out]];
|
|
|
+ }
|
|
|
+ private function setNewData1($old_data,$data){
|
|
|
+// var_dump($old_data);
|
|
|
+ $code_key_data = [];
|
|
|
+ foreach ($data as $v){
|
|
|
+ if(!isset($code_key_data[$v['material_code']])) $code_key_data[$v['material_code']] = [];
|
|
|
+ $code_key_data[$v['material_code']] = array_merge($code_key_data[$v['material_code']],$v['detail']);
|
|
|
+ }
|
|
|
+ $lind_bind = $old_data['lead_bind'];
|
|
|
+ $lind_bind_key_list = [];
|
|
|
+ foreach ($lind_bind['material_list'] as &$l){
|
|
|
unset($l['brand_qr_code_list']);
|
|
|
// $l['qty'] = $l['fake_qty'];
|
|
|
$l['brand_qr_code_list'] = $this->getValues( $code_key_data[$l['material_code']],$l['qty']);
|
|
|
@@ -156,100 +211,6 @@ class DwyService extends Service
|
|
|
// var_dump($lind_bind);
|
|
|
// var_dump($lead_out);die;
|
|
|
return [$lind_bind,['brand_out_stock_list'=>$lead_out]];
|
|
|
- //{
|
|
|
- // "key": "DV00001",
|
|
|
- // "lead_bind": {
|
|
|
- // "device_code": "DV00001",
|
|
|
- // "material_list": [
|
|
|
- // {
|
|
|
- // "product_code": "BC020202000999",
|
|
|
- // "product_code_show": "\u4fe1\u606f\u90e8\u6d4b\u8bd51800\u9999\u6749\u6728",
|
|
|
- // "order_item_id": "581732116677795840",
|
|
|
- // "order_item_id_show": "SO202405240088",
|
|
|
- // "material_code": "40010101000999",
|
|
|
- // "material_code_show": "E0\u6279\u96f6\u514d\u6f06\uff08\u6d4b\u8bd5\u767d\u6807\uff09",
|
|
|
- // "process_title": null,
|
|
|
- // "process_title_two": null,
|
|
|
- // "color": null,
|
|
|
- // "fake_qty": 20,
|
|
|
- // "color_two": null,
|
|
|
- // "brand_qr_code_list": [
|
|
|
- // "DN2EYGAT3XJJRGMHJ5CL",
|
|
|
- // ],
|
|
|
- // "order_no_list": "SO202405240088"
|
|
|
- // },
|
|
|
- // {
|
|
|
- // "product_code": "BC020202000999",
|
|
|
- // "product_code_show": "\u4fe1\u606f\u90e8\u6d4b\u8bd51800\u9999\u6749\u6728",
|
|
|
- // "order_item_id": "581732116677795840",
|
|
|
- // "order_item_id_show": "SO202405240088",
|
|
|
- // "material_code": "40010101000999",
|
|
|
- // "material_code_show": "E0\u6279\u96f6\u514d\u6f06\uff08\u6d4b\u8bd5\u767d\u6807\uff09",
|
|
|
- // "process_title": null,
|
|
|
- // "process_title_two": null,
|
|
|
- // "color": null,
|
|
|
- // "fake_qty": 10,
|
|
|
- // "color_two": null,
|
|
|
- // "brand_qr_code_list": [
|
|
|
- // "13NMKBBM8O8JBRWDJHW3",
|
|
|
- // ],
|
|
|
- // "order_no_list": "SO202405240088"
|
|
|
- // }
|
|
|
- // ]
|
|
|
- // },
|
|
|
- // "lead_out": {
|
|
|
- // "brand_out_stock_list": [
|
|
|
- // {
|
|
|
- // "in_out_type_code": "CK00004",
|
|
|
- // "in_out_type_code_show": "\u5546\u6807\u4ed3\u6b63\u5e38\u9886\u6807\u51fa\u5e93",
|
|
|
- // "send_box_code": "CK00014",
|
|
|
- // "send_box_code_show": "\u5546\u6807\u5341\u4e00\u53f7\u4ed3",
|
|
|
- // "device_code": "DV00001",
|
|
|
- // "get_brand_source_dk": "SALE_ORDER",
|
|
|
- // "brand_out_stock_dtl": [
|
|
|
- // {
|
|
|
- // "item_no": 10,
|
|
|
- // "brand_qr_code_list": "",
|
|
|
- // "material_code": "40010101000999",
|
|
|
- // "restock_qty": 0,
|
|
|
- // "material_code_show": "E0\u6279\u96f6\u514d\u6f06\uff08\u6d4b\u8bd5\u767d\u6807\uff09",
|
|
|
- // "unit_code": "ST",
|
|
|
- // "unit_code_show": "\u5f20",
|
|
|
- // "qty": "24",
|
|
|
- // "bus_type_dk": "SALE_ORDER",
|
|
|
- // "bus_type_dk_show": "\u9500\u552e\u8ba2\u5355",
|
|
|
- // "bus_no": "581732116677795840",
|
|
|
- // "bus_no_show": "SO202405240088"
|
|
|
- // }
|
|
|
- // ]
|
|
|
- // },
|
|
|
- // {
|
|
|
- // "in_out_type_code": "CK00004",
|
|
|
- // "in_out_type_code_show": "\u5546\u6807\u4ed3\u6b63\u5e38\u9886\u6807\u51fa\u5e93",
|
|
|
- // "send_box_code": "CK00012",
|
|
|
- // "send_box_code_show": "\u5546\u6807\u4e5d\u53f7\u4ed3",
|
|
|
- // "device_code": "DV00001",
|
|
|
- // "get_brand_source_dk": "SALE_ORDER",
|
|
|
- // "brand_out_stock_dtl": [
|
|
|
- // {
|
|
|
- // "item_no": 10,
|
|
|
- // "brand_qr_code_list": "13NMKBBM8O8JBRWDJHW3",
|
|
|
- // "material_code": "40010101000999",
|
|
|
- // "restock_qty": 0,
|
|
|
- // "material_code_show": "E0\u6279\u96f6\u514d\u6f06\uff08\u6d4b\u8bd5\u767d\u6807\uff09",
|
|
|
- // "unit_code": "ST",
|
|
|
- // "unit_code_show": "\u5f20",
|
|
|
- // "qty": "5",
|
|
|
- // "bus_type_dk": "SALE_ORDER",
|
|
|
- // "bus_type_dk_show": "\u9500\u552e\u8ba2\u5355",
|
|
|
- // "bus_no": "581732116677795840",
|
|
|
- // "bus_no_show": "SO202405240088"
|
|
|
- // }
|
|
|
- // ]
|
|
|
- // }
|
|
|
- // ]
|
|
|
- // }
|
|
|
- //}
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -320,7 +281,7 @@ class DwyService extends Service
|
|
|
|
|
|
foreach ($data['list'] as $value){
|
|
|
$key = $value['order_item_id'] . hash('md5', $value['title']);
|
|
|
- $bool = $this->limitingSendRequestBackg($key, $value['num'], 3600);
|
|
|
+ $bool = $this->limitingSendRequestBackg($key, $value['num'], 600);
|
|
|
if(! $bool) return [false, '同一产品相同商标限制同时操作，请稍后操作！'];
|
|
|
}
|
|
|
|
gogs