diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index be8d74f1..24d9af48 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -488,8 +488,8 @@ public class DsTaskingServiceImpl extends BaseServiceImpl dsTaskingList = baseMapper.selectDisposeList(page, dsTasking); if(!CollectionUtils.isEmpty(dsTaskingList)){ @@ -501,7 +501,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl pagesVO = service.listErp(Condition.getPage(query), search); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index 5af235ca..b1f1a156 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -178,6 +178,14 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class); - // 保存 或 更新 - faultService.saveOrUpdateBatch(listF); - // 关联rsId - for (ReviewDutyVO voD : vo.getDutyList()) { - voD.setReviewSheetId(vo.getId()); + + List listF = null; + + if(null != vo.getFaultList() && vo.getFaultList().size() > 0){ + // 关联rsId + for (ReviewFaultVO voF : vo.getFaultList()) { + voF.setReviewSheetId(vo.getId()); + } + listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class); + // 保存 或 更新 + faultService.saveOrUpdateBatch(listF); } + + + // 删除 if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) { dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds())); } - List listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class); - // 保存 或 更新 - dutyService.saveOrUpdateBatch(listD); + + + List listD = null; + if(null != vo.getDutyList() && vo.getDutyList().size() > 0){ + // 关联rsId + for (ReviewDutyVO voD : vo.getDutyList()) { + voD.setReviewSheetId(vo.getId()); + } + listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class); + // 保存 或 更新 + dutyService.saveOrUpdateBatch(listD); + } + + // 审理单 ReviewSheet rs = getById(vo.getId()); // 从数据库中查到 log.info("ReviewSheet rs = {}", rs); @@ -403,29 +427,33 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl vods = new ArrayList<>(); - for(ReviewDuty vod : listD){ - ReviewDutyDTO vodDTO = new ReviewDutyDTO(); - vodDTO.setTrialId(vod.getReviewSheetId()+""); - vodDTO.setReqQty(vod.getQty()); - vodDTO.setUnit(vod.getUnit()); - vodDTO.setCorrBatchNo(vod.getRelevantBatch()); - vods.add(vodDTO); + if(null != listD && listD.size() > 0){ + for(ReviewDuty vod : listD){ + ReviewDutyDTO vodDTO = new ReviewDutyDTO(); + vodDTO.setTrialId(vod.getReviewSheetId()+""); + vodDTO.setReqQty(vod.getQty()); + vodDTO.setUnit(vod.getUnit()); + vodDTO.setCorrBatchNo(vod.getRelevantBatch()); + vods.add(vodDTO); + } } - List vofs = new ArrayList<>(); - for(ReviewFault vof : listF){ - ReviewFaultDTO vofDTO = new ReviewFaultDTO(); - vofDTO.setTrialId(vof.getReviewSheetId()+""); - vofDTO.setFaultType(vof.getNgType2Id()+""); - vofDTO.setQuestClass(vof.getNgType3Id()+""); - vofDTO.setQuestSubclass(vof.getNgType4Id()+""); - vofDTO.setProportion(vof.getScale()); - vofDTO.setFaultQty(vof.getQty()); - vofDTO.setDescribe(vof.getMemo()); - vofs.add(vofDTO); + if(null != listF && listF.size() > 0){ + for(ReviewFault vof : listF){ + ReviewFaultDTO vofDTO = new ReviewFaultDTO(); + vofDTO.setTrialId(vof.getReviewSheetId()+""); + vofDTO.setFaultType(vof.getNgType2Id()+""); + vofDTO.setQuestClass(vof.getNgType3Id()+""); + vofDTO.setQuestSubclass(vof.getNgType4Id()+""); + vofDTO.setProportion(vof.getScale()); + vofDTO.setFaultQty(vof.getQty()); + vofDTO.setDescribe(vof.getMemo()); + vofs.add(vofDTO); + } } + // JSONObject obj = new JSONObject(); // obj.put("qmsRepairApplyDTO", dto); // obj.put("qmsRepairPartList", vods); @@ -465,8 +493,10 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl yieldOrderList=new ArrayList<>(); purtosoList.forEach(mesRbPurtoso -> { YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYpArea((double) 0); + yieldOrder.setSiteWork(true); + yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); yieldOrder.setYpCode(mesRbPurtoso.getWono()); yieldOrder.setYpMemo("物资转车间协作加工"); yieldOrder.setManualIncrease(false); @@ -329,6 +332,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { List yieldOrderList=new ArrayList<>(); pacturnrecordList.forEach(mesRbPacturnrecord -> { YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYpArea((double) 0); + yieldOrder.setSiteWork(true); + yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); yieldOrder.setYpMemo("临时工艺转工"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbPacturnrecord.getSono());//生产单号 @@ -381,6 +387,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { List yieldOrderList=new ArrayList<>(); rbtosoList.forEach(mesRbtoso -> { YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYpArea((double) 0); + yieldOrder.setSiteWork(true); + yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号 yieldOrder.setBatchNo(mesRbtoso.getSplcode());//批次号 @@ -426,6 +435,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { List yieldOrderList=new ArrayList<>(); wxpromotionList.forEach(mesRbWxpromotion -> { YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYpArea((double) 0); + yieldOrder.setSiteWork(true); + yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); yieldOrder.setYpMemo("推进计划"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbWxpromotion.getSono());//生产单号 @@ -479,6 +491,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { List yieldOrderList=new ArrayList<>(); mesRbSodelrecwxList.forEach(mesRbSodelrecwx -> { YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYpArea((double) 0); + yieldOrder.setSiteWork(false); + yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号 yieldOrder.setBatchNo(mesRbSodelrecwx.getSplcode());//批次号 @@ -534,6 +549,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { mesRbSodelreczgList.forEach(mesRbSodelreczg -> { //将查询出的数据放到单个的变量中 YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYpArea((double) 0); + yieldOrder.setSiteWork(true); + yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); yieldOrder.setYpMemo("正式工艺转工"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbSodelreczg.getSono());//生产单号 @@ -595,6 +613,9 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { List yieldOrderList=new ArrayList<>(); mesRbPkList.forEach(mesRbPk -> { YieldOrder yieldOrder=new YieldOrder(); + yieldOrder.setYpArea((double) 0); + yieldOrder.setSiteWork(true); + yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); yieldOrder.setYoCode(mesRbPk.getWono());//生产单号 yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号 yieldOrder.setPartCode(mesRbPk.getPrtno());//零件号 @@ -614,7 +635,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldOrder.setPkUsername(mesRbPk.getNewlevname()); yieldOrder.setPkDate(mesRbPk.getNewlevdate()); yieldOrder.setYieldType(YieldOrderEnum.YIELD_TYPE_1.getCode()); - yieldOrder.setRoamNoNext( ""); + yieldOrder.setRoamNoNext(""); if(StringUtils.isNotEmpty(mesRbPk.getFirseq())){ String roamNoNext=mesRbPartoplinkService.getRoamNoNext(mesRbPk.getPrtno(),mesRbPk.getFirseq()); yieldOrder.setRoamNoNext(roamNoNext);//下级b号 diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java index 62f9aa35..ac1ad44a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java @@ -356,7 +356,9 @@ public class UserController { //热表工艺员 ids.add(2032373858255548418L); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("role_id",ids); +// queryWrapper.in("role_id",ids); + queryWrapper.like("role_id","2032373544077012993"); + queryWrapper.like("role_id","2032373858255548418"); List list = userService.list(queryWrapper); return R.data(list); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java index e9c447bf..bf169fcf 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java @@ -49,6 +49,7 @@ import org.springblade.system.pojo.entity.User; import org.springblade.system.pojo.vo.DeptVO; import org.springblade.system.pojo.vo.UserVO; import org.springblade.system.service.IDeptService; +import org.springblade.system.service.IUserExtService; import org.springblade.system.service.IUserService; import org.springblade.system.wrapper.DeptWrapper; import org.springblade.system.wrapper.UserWrapper; @@ -71,6 +72,7 @@ public class DeptServiceImpl extends ServiceImpl implements ID private final IUserService userService; private final IWorkCenterClient workCenterClient; + private final IUserExtService userExtService; @Override public List lazyList(String tenantId, Long parentId, Map param) { // 设置租户ID @@ -185,6 +187,9 @@ public class DeptServiceImpl extends ServiceImpl implements ID roleIds.add("2032373544077012993"); roleIds.add("2032373858255548418"); +// List list = userExtService.listAllByRoleIds("2032373544077012993,2032373858255548418"); +// List userIds = list.stream().map(User::getId).collect(Collectors.toList()); + BasicClazz detail = workCenterClient.getClazzById(clazzId).getData(); if(detail != null){ String teamId = detail.getTeamMemberId(); @@ -192,12 +197,29 @@ public class DeptServiceImpl extends ServiceImpl implements ID List ids = Func.toLongList(teamId); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.notIn("id",ids); - queryWrapper.in("role_id",roleIds); +// if(null != userIds && userIds.size() > 0){ +// queryWrapper.in("id",userIds); +// }else{ +// List unUserIds = new ArrayList<>(); +// unUserIds.add(0L); +// queryWrapper.in("id",unUserIds); +// } +// queryWrapper.in("role_id",roleIds); +// queryWrapper.like("role_id","2032373544077012993"); +// queryWrapper.like("role_id","2032373858255548418"); // queryWrapper.eq("dept_id",parentId); teamUnSelects = userService.list(queryWrapper); }else{ QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("role_id",roleIds); +// queryWrapper.in("id",userIds); +// if(null != userIds && userIds.size() > 0){ +// queryWrapper.in("id",userIds); +// }else{ +// List unUserIds = new ArrayList<>(); +// unUserIds.add(0L); +// queryWrapper.in("id",unUserIds); +// } +// queryWrapper.in("role_id",roleIds); // queryWrapper.eq("dept_id",parentId); teamUnSelects = userService.list(queryWrapper); } @@ -207,7 +229,10 @@ public class DeptServiceImpl extends ServiceImpl implements ID List ids = Func.toLongList(teamId); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("id",ids); - queryWrapper.in("role_id",roleIds); +// queryWrapper.in("id",userIds); +// queryWrapper.in("role_id",roleIds); +// queryWrapper.like("role_id","2032373544077012993"); +// queryWrapper.like("role_id","2032373858255548418"); // queryWrapper.eq("dept_id",parentId); teamSelects = userService.list(queryWrapper);