版本大修改

app/Service/ApplyOrderService.php

@@ -1513,7 +1513,7 @@ class ApplyOrderService extends Service
             if(! empty($insert)) ScrappCount::insert($insert);
             //获取新增的单据
             $result = ScrappCount::whereIn('order_number',$get_order_number)
-                ->select('scrapp_num as num','id','dispatch_sub_id','warehouse_no','warehouse_title')
+                ->select('scrapp_num as num','id','dispatch_sub_id','warehouse_no','warehouse_title','result')
                 ->get()->toArray();
 
             //完工入库申请单 半成品
@@ -1618,7 +1618,8 @@ class ApplyOrderService extends Service
         $all_data_map = array_column($all_data,null,'dispatch_id');
         $need_insert = [];
         foreach ($dispatchList as $value){
-            $num = $all_data_map[$value['id']] ?? 0;
+            $num = $all_data_map[$value['id']] ?? [];
+            $num = $num['num'] ?? 0;
             if(! $num) continue;
             if(isset($map[$value['order_product_id']]) && $map[$value['order_product_id']] == $value['process_id']){
                 $tmp = [