设置功能修改

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java

@@ -194,6 +194,9 @@ public class TeamSetController extends BladeController {
         String result = null;
         String team = null;
         if(null != teamIds && teamIds.size() > 0){
+            QueryWrapper<RelTeamSetUser> qwuser = new QueryWrapper<>();
+            qwuser.eq("TEAM_SET_ID", detail.getId());
+            relTeamSetUserService.remove(qwuser);
             for(Long teamId:teamIds){
                 RelTeamSetUser relTeamSetUser = new RelTeamSetUser();
                 relTeamSetUser.setTeamSetId(detail.getId());

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java

@@ -287,6 +287,10 @@ public class WorkCenterController extends BladeController {
         String team = null;
         if(null != teamIds && teamIds.size() > 0){
 
+            QueryWrapper<CenterTeam> qwcenteam = new QueryWrapper<>();
+            qwcenteam.eq("WC_ID",detail.getId());
+            teamCenterService.remove(qwcenteam);
+
             for(Long teamId:teamIds){
                 CenterTeam centerteam = new CenterTeam();
                 centerteam.setWcId(detail.getId());

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java

@@ -97,10 +97,14 @@ public class WorkTankController extends BladeController {
 //            }
             if(null != one.getUpdateUser() && !"".equals(one.getUpdateUser())){
                 R<User> userplan= iUserClient.userInfoById(one.getUpdateUser());
-                one.setOpUserRealName(userplan.getData().getRealName());
+                if(null != userplan && null != userplan.getData() && null != userplan.getData().getRealName()){
+                    one.setOpUserRealName(userplan.getData().getRealName());
+                }
             }else{
                 R<User> userplan= iUserClient.userInfoById(one.getCreateUser());
-                one.setOpUserRealName(userplan.getData().getRealName());
+                if(null != userplan && null != userplan.getData() && null != userplan.getData().getRealName()){
+                    one.setOpUserRealName(userplan.getData().getRealName());
+                }
             }
 
         }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java

@@ -58,6 +58,7 @@ import org.springblade.system.cache.DictCache;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.pojo.entity.User;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -88,6 +89,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IWorkPlanService workPlanService;
 
+
+    // 关键：用set方法注入
+//    @Autowired
+//    public void setWorkPlanService(IWorkPlanService workPlanService) {
+//        this.workPlanService = workPlanService;
+//    }
+
     private final IBsProcessSetService bsProcessSetService;
 
     private final IWorkPlanItemService workPlanItemService;
@@ -137,6 +145,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IReviewSheetService reviewSheetService;
 
+//    @Autowired
+//    public void setReviewSheetService(IReviewSheetService reviewSheetService) {
+//        this.reviewSheetService = reviewSheetService;
+//    }
+
     private final IOemCraftAbilityService oemCraftAbilityService;
 
     private final IWorkCenterService workCenterService;

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -1375,7 +1375,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
                 task.setCheckUserId(AuthUtil.getUserId());
                 task.setCheckDate(LocalDateTime.now());
-//                this.computeOrderQty(wp, task, wo, sumCheckQ, sumTestQty, sumLossQty, 0);
+                this.computeOrderQty(wp, wo, sumCheckQ, sumTestQty, sumLossQty, 0);
 //                this.qualified(wp, wc, wo);
 
             } else if (countNA == itemList.size()) { // 全部item NA
@@ -1404,6 +1404,33 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         return task;
     }
 
+
+    public void computeOrderQty(WorkPlan wp, WorkOrder wo, int checkQ, int testQty, int lossQty, int scrapQty) {
+
+        if (wo != null) {
+            wo.setMakeQty(wo.getMakeQty() - (testQty + lossQty + scrapQty));
+            wo.setTestQty(wo.getTestQty() + testQty);
+            wo.setLossQty(wo.getLossQty() + lossQty);
+            wo.setScrapQty(wo.getScrapQty() + scrapQty);
+            log.info("车间订单:{}, 扣除测试数量:{}", wo.getWoCode(), wo.getTestQty());
+        }
+
+        if (wp != null) {
+            // 查询此工序是否有试验项目,如果有说明是检验工序
+//            List<PrWorkPlanItem> list = prWorkPlanItemService.listByWpId(wp.getWpId());
+            QueryWrapper<WorkPlanItem> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("WP_ID", wp.getId());
+            List<WorkPlanItem> list = wpItemService.list(queryWrapper);
+            if (list != null && list.size() > 0) {
+                wp.setWorkQty(wo.getMakeQty());
+            }
+            wp.setTestQty(wp.getTestQty() + testQty);
+            wp.setLossQty(wp.getLossQty() + lossQty);
+            wp.setScrapQty(wp.getScrapQty() + scrapQty);
+        }
+    }
+
+
     private JSONObject glassCake(Long woId) {
         JSONObject obj = new JSONObject();
         // 子件订单信息