Эх сурвалжийг харах

扫码开始新批次的时候,如果存在邀请人,需要清除

zhuangdezheng 1 жил өмнө
parent
commit
4d3698eed4

+ 12 - 0
src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -10,6 +10,7 @@ import cn.ezhizao.project.business.deptProcess.domain.BizDeptProcess;
 import cn.ezhizao.project.business.process.domain.BizProcess;
 import cn.ezhizao.project.business.product.domain.*;
 import cn.ezhizao.project.business.product.service.*;
+import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
 import cn.ezhizao.project.system.domain.SysUser;
@@ -23,6 +24,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static cn.hutool.poi.excel.sax.ElementName.v;
+
 /**
  * 报工Controller
  *
@@ -59,6 +62,9 @@ public class BizDayworkController extends BaseController {
     @Resource
     private IBizLotTechnologicalProcessDetailService bizLotTechnologicalProcessDetailService;
 
+    @Resource
+    private IBizProductionResourceGroupDetailService bizProductionResourceGroupDetailService;
+
     @Resource
     private IBizProductionPlanDetailService bizProductionPlanDetailService;
 
@@ -1095,6 +1101,12 @@ public class BizDayworkController extends BaseController {
                 updates.add(l);
                 l.getDaywork().setDeptId(l.getDeptId());
             }
+            if(l.getStatus().equals("7")) {
+                BizDaywork daywork = l.getDaywork();
+                daywork.setProtemProcessId(l.getProcessId());
+                // 如果被邀请人不是本工段内的人,则需要从当前资源组中删除被邀请人
+                bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
+            }
             updateDaywork.add(l.getDaywork());
 
             BizDayworkItem bizDayworkItem = new BizDayworkItem();