fyy

app/Service/Box/BoxService.php

@@ -625,6 +625,8 @@ class BoxService extends Service
             if(empty($value['submit_quantity']) || ! is_numeric($value['submit_quantity']) || $value['submit_quantity'] > $value['quantity']) return [false,'包装数量错误'];
             if(empty($value['team_id'])) return [false,'班组必须选择'];
 
+            $tmp = $value;
+            $tmp['iquantity'] = $value['submit_quantity'];
             $detail[] = [
                 'order_no' => $order_no,
                 'out_order_no' => $value['csocode'],
@@ -648,6 +650,7 @@ class BoxService extends Service
                 'box_type' => 2,
                 'team_id' => $value['team_id'],
                 'shipment_order_no' => $value['cdlcode'],
+                'post' => json_encode($tmp),
             ];
         }
 

app/Service/FyyOrderService.php

@@ -293,21 +293,21 @@ class FyyOrderService extends Service
             $model_box->setConnection($database);
             $model_box->whereIn('order_no',$data['order_no'])->update([
                 'state' => 2,
-                'shipment_order_no' => $data['shipment_code'],//发货单号
+//                'shipment_order_no' => $data['shipment_code'],//发货单号
             ]);
-            $box = new BoxDetail(['channel'=>$data['top_order_no']]);
-            $box->setConnection($database);
-            $box->where('order_no',$data['order_no'])->update([
-                'shipment_order_no' => $data['shipment_code']//发货单号
-            ]);
-
-            $models = new SaleOrdersProduct();
-            $models->setConnection($database);
-            foreach ($data['box_data'] as $value){
-                $models->where('id',$value['top_id'])->update([
-                    'shipment_num' => DB::raw("shipment_num + {$value['num']}"),
-                ]);
-            }
+//            $box = new BoxDetail(['channel'=>$data['top_order_no']]);
+//            $box->setConnection($database);
+//            $box->where('order_no',$data['order_no'])->update([
+//                'shipment_order_no' => $data['shipment_code']//发货单号
+//            ]);
+
+//            $models = new SaleOrdersProduct();
+//            $models->setConnection($database);
+//            foreach ($data['box_data'] as $value){
+//                $models->where('id',$value['top_id'])->update([
+//                    'shipment_num' => DB::raw("shipment_num + {$value['num']}"),
+//                ]);
+//            }
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
@@ -321,9 +321,9 @@ class FyyOrderService extends Service
         if(empty($data['order_no'])) return [false,'包装单号不能为空！'];
 //        if(empty($data['order_number'])) return [false,'销售订单号不能为空！'];
         if(empty($data['post'])) return [false,'发货单数据不能为空！'];
-        if(empty($data['box_data'])) return [false,'包装单数据不能为空！'];
-        if(empty($data['top_order_no'])) return [false,'顶部订单号不能为空！'];
-        if(empty($data['shipment_code'])) return [false,'发货单订单号不能为空！'];
+//        if(empty($data['box_data'])) return [false,'包装单数据不能为空！'];
+//        if(empty($data['top_order_no'])) return [false,'顶部订单号不能为空！'];
+//        if(empty($data['shipment_code'])) return [false,'发货单订单号不能为空！'];
 
         $boxList = Box::whereIn('order_no',$data['order_no'])->get()->toArray();
         if(empty($boxList)) return [false,'包装单不存在！'];