0606

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -816,6 +816,8 @@ public class BizDayworkController extends BaseController {
                     bizDeptProcess.setDeptId(bizDaywork.getDeptId());
                     BizLot lot = bizLotService.getById(bizDaywork.getLotId());
                     bizDaywork.setProductId(lot.getProductId());
+                    //开始新批次的时候将daywork主表的status设置为1
+                    bizDaywork.setStatus(1);
                     //不需要当前序
                     bizDayworkService.save(bizDaywork);
                     //保存炉号信息

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -474,16 +474,19 @@ public class BizDayworkItemController extends BaseController {
             }
             //工序结束时将合格数保存
             daywork.setProtemProcessId(bizDayworkItem.getProcessId());
-            daywork.setTemporaryProcessQualifiedNum(lot);
+            //daywork.setTemporaryProcessQualifiedNum(lot);
             // 此处在biz_daywork_qualified中间表中，插入一条数据
             // 记录当前批次，当前工序的投入数、合格数
-            bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
-            bizDayworkService.updateById(daywork);
+
 
             //判断当前序为最后一道序
             if (bizDayworkItem.getProcessStepNumber().equals(daywork.getProcessSequence().get(daywork.getProcessSequence().size() - 1).getProcessStepNumber())) {
                 bizDayworkCarrierService.removeByDayworkId(daywork.getId());
+                //最后一道序的时候，把daywork表的status设置为2
+                daywork.setStatus(2);
             }
+            bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
+            bizDayworkService.updateById(daywork);
         }
         //如果没有合格数，则投产数量为总数量，上道序的合格数为下到序的投产数
         if (daywork.getProcessQualifiedNum() == 0) {

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -191,6 +191,10 @@ public class SortDayworkController extends BaseController {
             bizDayworkCarriers.forEach(l -> {
                 l.setIsChanged(1);
             });
+            //最后一道序结束报工的时候，将daywork主表的status设置为2
+            BizDaywork daywork = bizDayworkService.query().eq("id", item.getDayworkId()).one();
+            daywork.setStatus(2);
+            bizDayworkService.updateById(daywork);
             result = result && (bizDayworkCarriers.isEmpty() || bizDayworkCarrierService.updateBatchById(bizDayworkCarriers));
         }
         return result ? success() : error("结束失败");