diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java index 66d946dc..f0b28c9d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -34,5 +34,8 @@ public class InspectionTaskDetailVO extends InspectionTask { private List remindMsgList; + private List colorMsges; + private List msgplateList; private List wpItemList; + private List msgMaterialList; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index 20b446c8..3501aaea 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -127,4 +127,10 @@ public class InspectionTaskListVO extends InspectionTask { private Long wpId; + private Long processId; + + private String plateCode; + private String configCode; + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index 9d7db4a1..ca126d44 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -327,6 +327,94 @@ public class RemindMsgController extends BladeController { "导入模版-镀种消息提醒.xls"); } + @PostMapping("/importExcelPlate") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcelPlate(@RequestParam("file") MultipartFile file) { + List noticeList = new ArrayList<>(); + List list = ExcelUtil.read(file, RemindMsgExcel.class); + + for(RemindMsgExcel noticeExcel : list){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("PLATEING",noticeExcel.getPlateing()); + if(service.count(qw)>0){ + return R.fail(noticeExcel.getPlateing()+"此镀种信息已存在"); + } + RemindMsg notice = BeanUtil.copy(noticeExcel, RemindMsg.class); + notice.setRemindMsgType(1L); + noticeList.add(notice); + } + +// list.forEach(noticeExcel -> { +// RemindMsg notice = BeanUtil.copy(noticeExcel, RemindMsg.class); +// notice.setRemindMsgType(1L); +// noticeList.add(notice); +// }); + return R.data(service.saveBatch(noticeList)); + } + + @PostMapping("/importExcelColor") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcelColor(@RequestParam("file") MultipartFile file) { + List noticeList = new ArrayList<>(); + List list = ExcelUtil.read(file, RemindMsgExcel.class); + + for(RemindMsgExcel noticeExcel : list){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("SUB_PART_CODE",noticeExcel.getSubPartCodeNew()); + if(service.count(qw)>0){ + return R.fail(noticeExcel.getSubPartCode()+"此零件信息已存在"); + } + RemindMsg notice = BeanUtil.copy(noticeExcel, RemindMsg.class); + notice.setRemindMsgType(2L); + notice.setSubPartCode(noticeExcel.getSubPartCodeNew()); + noticeList.add(notice); + } + +// +// list.forEach(noticeExcel -> { +// RemindMsg notice = BeanUtil.copy(noticeExcel, RemindMsg.class); +// notice.setRemindMsgType(2L); +// notice.setSubPartCode(noticeExcel.getSubPartCodeNew()); +// noticeList.add(notice); +// }); + return R.data(service.saveBatch(noticeList)); + } + + + @PostMapping("/importExcelMaterial") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcelMaterial(@RequestParam("file") MultipartFile file) { + List noticeList = new ArrayList<>(); + List list = ExcelUtil.read(file, RemindMsgExcel.class); + + for(RemindMsgExcel noticeExcel : list){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("FORMULA",noticeExcel.getFormula()); + if(service.count(qw)>0){ + return R.fail(noticeExcel.getFormula()+"此程式编号已存在"); + } + + RemindMsg notice = BeanUtil.copy(noticeExcel, RemindMsg.class); + notice.setRemindMsgType(3L); + noticeList.add(notice); + + } +// +// list.forEach(noticeExcel -> { +// RemindMsg notice = BeanUtil.copy(noticeExcel, RemindMsg.class); +// notice.setRemindMsgType(3L); +// notice.setSubPartCode(noticeExcel.getSubPartCodeNew()); +// noticeList.add(notice); +// }); + return R.data(service.saveBatch(noticeList)); + } + + + + @GetMapping("/downloadExcelTemplateColor") @ApiOperationSupport(order = 71) @Operation(summary = "下载Excel模板", description = "") @@ -373,7 +461,7 @@ public class RemindMsgController extends BladeController { notice.setSubPartId(partsubs.get(0).getId()); } - + notice.setRemindMsgType(0L); noticeList.add(notice); }); return R.data(service.saveBatch(noticeList)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 0274fd59..c7ada2ce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -87,6 +87,7 @@ yo.PART_CODE AS partCode, yo.PART_VERSION AS partVersion, yo.ID AS yoId, + ps.ID AS processId, yo.PART_CODE AS prodCode, wo.TEST_QTY as orderCheckQty, wo.LOSS_QTY as orderLossQty, @@ -146,7 +147,7 @@ ps.NAME as currentProcessName,ps01.NAME as nextProcessName,yo.PRODUCT_IDENT as prodIdent, yo.YP_AREA * wo.MAKE_QTY as areaTotal,yo.YP_AREA as area,wo.MAKE_QTY as poQty, t.*,wo.WO_CODE as woCode, - wo.PART_CODE AS partCode, + yo.PART_CODE AS partCode, wo.CARD_NO AS cardNo FROM QA_INSPECTION_TASK t -- 车间作业计划 wp diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 3b5768eb..9b5f1b74 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -30,7 +30,9 @@ import org.springblade.desk.basic.constant.BaseValue; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.CenterTeam; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.entity.Plating; import org.springblade.desk.basic.service.ICenterTeamService; +import org.springblade.desk.basic.service.IPlatingService; import org.springblade.desk.basic.util.IdUtil; import org.springblade.desk.basic.util.StatusCountMap; import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity; @@ -105,6 +107,8 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl parts = partService.list(qwpart); - + Long processId = detailDetail.getProcessId(); + String prodIdent = detailDetail.getProdIdent(); + //查询零件号消息提醒 List msgList = new ArrayList<>(); + List msgListNew = new ArrayList<>(); if(null != parts && parts.size() > 0){ + + if(null != processId && 107L == processId){ + LambdaQueryWrapper qw = Wrappers.lambdaQuery(RemindMsg.class) + .eq(RemindMsg::getPartId, parts.get(0).getId()) +// .eq(RemindMsg::getQualityLevel, prodIdent) + .eq(RemindMsg::getIsHeatTreatment, "1") + .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE) + .eq(RemindMsg::getRemindMsgType, 0L) + .orderByDesc(RemindMsg::getId); + msgList = service.list(qw); + int count = 0; + if(null != msgList && msgList.size() > 0){ + for(RemindMsg msg : msgList){ + if(null != msg.getQualityLevel() + && !"".equals(msg.getQualityLevel())){ + if(msg.getQualityLevel().equals(prodIdent)){ + ++count; + msgListNew.add(msg); + } + } + } + if(count == 0){ + msgListNew = msgList; + } + } + } + + if(null != processId && 21L == processId){ + LambdaQueryWrapper qw = Wrappers.lambdaQuery(RemindMsg.class) + .eq(RemindMsg::getPartId, parts.get(0).getId()) +// .eq(RemindMsg::getQualityLevel, prodIdent) + .eq(RemindMsg::getIsAfterPlating, "1") + .eq(RemindMsg::getRemindMsgType, 0L) + .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE) + .orderByDesc(RemindMsg::getId); + msgList = service.list(qw); + int count = 0; + if(null != msgList && msgList.size() > 0){ + for(RemindMsg msg : msgList){ + if(null != msg.getQualityLevel() + && !"".equals(msg.getQualityLevel())){ + if(msg.getQualityLevel().equals(prodIdent)){ + ++count; + msgListNew.add(msg); + } + } + } + if(count == 0){ + msgListNew = msgList; + } + } + } + + } +// +// List msgList = new ArrayList<>(); +// msgList.add(msg1); + vo.setRemindMsgList(msgListNew); + + //颜色提醒 + List list = partService.getPartSubList(detailDetail.getPartCode(), null); + List colorMsges = new ArrayList<>(); + if(null != list && list.size() > 0){ + for(DsPartEntity partEntity : list){ + List msges = new ArrayList<>(); + LambdaQueryWrapper qw = Wrappers.lambdaQuery(RemindMsg.class) + .eq(RemindMsg::getSubPartCode, partEntity.getPartCode()) +// .eq(RemindMsg::getQualityLevel, prodIdent) + .eq(RemindMsg::getRemindMsgType, 2L) + .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE); + msges = service.list(qw); + colorMsges.addAll(msges); + } + } + + + vo.setColorMsges(colorMsges); + + List msgplateList = new ArrayList<>(); + List msgplateAllList = new ArrayList<>(); + //镀层提醒 + if(null != detailDetail.getPlateCode()){ LambdaQueryWrapper qw = Wrappers.lambdaQuery(RemindMsg.class) - .eq(RemindMsg::getPartId, parts.get(0).getId()) + .eq(RemindMsg::getPlateing, detailDetail.getPlateCode()) +// .eq(RemindMsg::getQualityLevel, prodIdent) .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE) + .eq(RemindMsg::getRemindMsgType, 1L) .orderByDesc(RemindMsg::getId); - msgList = service.list(qw); + msgplateList = service.list(qw); + int count = 0; + if(null != msgplateList && msgplateList.size() > 0){ + for(RemindMsg msg : msgplateList){ + if(null != msg.getQualityLevel() + && !"".equals(msg.getQualityLevel())){ + if(msg.getQualityLevel().equals(prodIdent)){ + ++count; + msgplateAllList.add(msg); + } + } + } + if(count == 0){ + msgplateAllList = msgplateList; + } + } + }else{//如果零件里镀种代号为空 + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Plating.class) + .eq(Plating::getPlating, detailDetail.getPlatingInfo()) + .eq(Plating::getConfigNo, detailDetail.getConfigCode()) +// .eq(RemindMsg::getQualityLevel, prodIdent) + .eq(Plating::getIsDeleted, CommonConstant.DELETE_FALSE) + .orderByDesc(Plating::getId); + List platingList = platingService.list(qw); + if(null != platingList && platingList.size() > 0){ + Plating plating = platingList.get(0); + LambdaQueryWrapper qw01 = Wrappers.lambdaQuery(RemindMsg.class) + .eq(RemindMsg::getPlateing, plating.getPlateCode()) +// .eq(RemindMsg::getQualityLevel, prodIdent) + .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE) + .eq(RemindMsg::getRemindMsgType, 1L) + .orderByDesc(RemindMsg::getId); + msgplateList = service.list(qw01); + int count = 0; + if(null != msgplateList && msgplateList.size() > 0){ + for(RemindMsg msg : msgplateList){ + if(null != msg.getQualityLevel() + && !"".equals(msg.getQualityLevel())){ + if(msg.getQualityLevel().equals(prodIdent)){ + ++count; + msgplateAllList.add(msg); + } + } + } + if(count == 0){ + msgplateAllList = msgplateList; + } + } + } } + vo.setMsgplateList(msgplateAllList); + //材料提醒 + LambdaQueryWrapper qw01 = Wrappers.lambdaQuery(RemindMsg.class) +// .eq(RemindMsg::getQualityLevel, prodIdent) + .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE) + .eq(RemindMsg::getRemindMsgType, 3L) + .orderByDesc(RemindMsg::getId); + List msgMaterialList = service.list(qw01); + vo.setMsgMaterialList(msgMaterialList); -// -// List msgList = new ArrayList<>(); -// msgList.add(msg1); - vo.setRemindMsgList(msgList); vo.setWpItemList(wpItemService.listVOByTaskId(vo.getId())); } + @Override public void setDetailVOValueNew(InspectionTaskDetailVO vo) { vo.setWpItemList(wpItemService.listVOByTaskIdNew(vo.getId())); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java index d42d0800..c530b5fd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java @@ -74,7 +74,7 @@ public class RemindMsgServiceImpl extends BaseServiceImpl"+vo.getParam2Up()+""); } if(null == vo.getParam2Up() && null != vo.getParam2Down()){ - vo.setParam2(vo.getParam2Down()+""); + vo.setParam2(">"+vo.getParam2Down()+""); } if(null != vo.getParam3Up() && null != vo.getParam3Down()){ - vo.setParam3(vo.getParam3Up() + "~" + vo.getParam3Down()); + vo.setParam3(vo.getParam3Down()+"~"+vo.getParam3Up()); } if(null != vo.getParam3Up() && null == vo.getParam3Down()){ - vo.setParam3(vo.getParam3Up()+""); + vo.setParam3("<"+vo.getParam3Up()+""); } if(null == vo.getParam3Up() && null != vo.getParam3Down()){ - vo.setParam3(vo.getParam3Down()+""); + vo.setParam3(">"+vo.getParam3Down()+""); } } }