版本大修改

app/Service/ApplyOrderService.php

@@ -1547,6 +1547,21 @@ class ApplyOrderService extends Service
             if(! isset($map[$value['data_id']])) $map[$value['data_id']] = $value['quantity'];
         }
 
+        $sList = ScrappCount::where('del_time',0)
+            ->where('report_id', $data['id'])
+            ->select('dispatch_sub_id as dispatch_id','scrapp_num','quantity')
+            ->get()->toArray();
+        $sMap = [];
+        foreach ($sList as $value){
+            $num = bcadd($value['scrapp_num'], $value['quantity'],3);
+            if(isset($sMap[$value['dispatch_id']])){
+                $t = bcadd($sMap[$value['dispatch_id']], $num,3);
+                $sMap[$value['dispatch_id']] = $t;
+            }else{
+                $sMap[$value['dispatch_id']] = $num;
+            }
+        }
+
         if(empty($data['team_id'])) return [false, '质检班组不能为空'];
         if(empty($data['equipment_id'])) return [false, '设备不能为空'];
         if(empty($data['data'])) return [false, '质检信息不能为空'];
@@ -1568,6 +1583,8 @@ class ApplyOrderService extends Service
             $total = bcadd($num, $value['num'],3);
             $total2 = $map[$value['data_id']] ?? 0;
             if($total > $total2) return [false, '总数量不能超过报工数量'];
+            $tmp = $sMap[$value['data_id']] ?? 0;
+            if($total < $tmp) return [false, '报工单已完成报工'];
 
             $data_id[] = $value['data_id'];
         }