fyy

app/Service/DispatchService.php

@@ -67,6 +67,8 @@ class DispatchService extends Service
             DB::rollBack();
             return [false,$e->getLine().':'.$e->getMessage()];
         }
+
+        return [true,''];
     }
 
     public function makeData($equipment_id, $team_id,$employee_id,$message){
@@ -182,6 +184,7 @@ class DispatchService extends Service
                     'dispatch_no' => $dispatch_no,
                     'status' => 1
                 ]);
+            unset($result[$key]['quantity']);
         }
 
         DispatchSub::insert($result);
@@ -290,31 +293,28 @@ class DispatchService extends Service
         $map = $this->getDispatchQuantity($data['id']);
 
         $total_map = $return = [];
-        if($data['is_split']){
-            foreach ($data['id'] as $key => $value){
-                if(isset($total_map[$value])){
-                    $total_map[$value] += $data['quantity'][$key];
-                }else{
-                    $total_map[$value] = $data['quantity'][$key];
-                }
-                $tmp = $result_map[$value];
-                $tmp['quantity'] = $data['quantity'][$key];
-                $return[] = $tmp;
+        foreach ($data['id'] as $key => $value){
+            if(isset($total_map[$value])){
+                $total_map[$value] += $data['quantity'][$key];
+            }else{
+                $total_map[$value] = $data['quantity'][$key];
             }
+            $tmp = $result_map[$value];
+            $tmp['quantity'] = $data['quantity'][$key];
+            $return[] = $tmp;
         }
+
         foreach ($result as $key => $value){
             //数据校验
-            $quantity_tmp = $total_map[$value['order_product_id']] ?? $data['quantity'][$key];
+            $quantity_tmp = $total_map[$value['order_product_id']];
             if(isset($map[$value['order_product_id']])){
                 if($map[$value['order_product_id']] + $quantity_tmp > $value['production_quantity']) return [false,'派单数量不能大于生产订单数量'];
             }else{
                 if($quantity_tmp > $value['production_quantity']) return [false,'派单数量不能大于生产订单数量'];
             }
-            if(! empty($return)) $result[$key]['quantity'] = $data['quantity'][$key];
         }
 
-        $array = ! empty($return) ? $return : $result;
-        return [true, $array];
+        return [true, $return];
     }
 
     public function fillData($data){