提交

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

@@ -63,9 +63,11 @@ public class SortDayworkController extends BaseController {
     private IBizDayworkItemConsultPictureService bizDayworkItemConsultPictureService;
     // 修改报工状态为开始
     @PostMapping("/start")
+    @Transactional
     public AjaxResult start(@RequestBody BizDaywork bizDaywork) {
         // 获取最新报工
         List<BizDayworkItem> items = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").lt("status", "4").list();
+        BizDaywork currentDaywork = bizDayworkService.getById(bizDaywork.getId());
         BizDayworkItem item = items.get(0);
         if (item.getStatus().equals("0")) {
             item.setStatus("1");
@@ -73,17 +75,17 @@ public class SortDayworkController extends BaseController {
             item.setIsSort(1);
             bizDayworkItemService.updateById(item);
             // 判断是否是最后一道序，假设是最后一道序则申请打印合格证
-            if(item.getIsAmend().equals(1) || item.getIsWasteRecycling().equals(1)) {
+            if(currentDaywork.getIsAmend().equals(1) || currentDaywork.getIsWasteRecycling().equals(1)) {
                 List<BizLotTechnologicalProcessDetail> bizLotTechnologicalProcessDetails = bizLotTechnologicalProcessDetailService.query().eq("lot_technological_process_id", item.getTechnologicalProcessId()).ne("tenant_id", 9).orderByDesc("process_step_number").list();
                 if (bizLotTechnologicalProcessDetails.get(0).getProcessId().equals(item.getProcessId())) {
-                    bizDaywork.setIsCertificate(1);
-                    bizDayworkService.updateById(bizDaywork);
+                    currentDaywork.setIsCertificate(1);
+                    bizDayworkService.updateById(currentDaywork);
                 }
             } else {
                 List<BizTechnologicalProcessDetail> bizTechnologicalProcessDetails = bizTechnologicalProcessDetailService.query().eq("technological_process_id", item.getTechnologicalProcessId()).ne("tenant_id", 9).orderByDesc("process_step_number").list();
                 if (bizTechnologicalProcessDetails.get(0).getProcessId().equals(item.getProcessId())) {
-                    bizDaywork.setIsCertificate(1);
-                    bizDayworkService.updateById(bizDaywork);
+                    currentDaywork.setIsCertificate(1);
+                    bizDayworkService.updateById(currentDaywork);
                 }
             }
         }