From 7ebb475534d44aa9ca103a6721bc796ff2cf3902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Wed, 13 May 2026 11:43:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/MesRbFilePreserveSlotEntity.java | 2 +- .../pojo/vo/ProduceMonitorFileSlotVO.java | 2 +- .../controller/InspectionTaskController.java | 167 +++++++++--------- 3 files changed, 82 insertions(+), 89 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java index f8a98227..38bc463f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java @@ -43,7 +43,7 @@ public class MesRbFilePreserveSlotEntity extends BaseEntity { * 槽号序号 */ @Schema(description = "槽号序号") - private String slotIndex; + private Double slotIndex; /** * 插入序号 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorFileSlotVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorFileSlotVO.java index 9cd3dd63..52dff902 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorFileSlotVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorFileSlotVO.java @@ -22,7 +22,7 @@ public class ProduceMonitorFileSlotVO { private String insertIndex; @Schema(description = "槽号序号") - private String slotIndex; + private Double slotIndex; @Schema(description = "槽位/工步") private String slotName; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 0fb4cf90..c891f0c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -83,8 +83,9 @@ import java.util.stream.Collectors; * [检验任务] 控制器 * 工序级的检验任务 * mes v1: rb_pr_work_check PrWorkCheck - * + *

* ppsName:烧结包装防护 才有子件列表 + * * @author Tom Shuo * @since 2025-11-14 */ @@ -121,6 +122,7 @@ public class InspectionTaskController extends BladeController { private IWorkPlanItemService workPlanItemService; @Resource private IPlatingService platingService; + /** * [检验任务] 详情 */ @@ -130,9 +132,9 @@ public class InspectionTaskController extends BladeController { public R detail(InspectionTask inspectionTask) { // InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); - log.error("[检验任务]id="+inspectionTask.getId()); + log.error("[检验任务]id=" + inspectionTask.getId()); InspectionTask detail = service.getById(inspectionTask.getId()); - log.error("检验任务数据000001: {}"+ detail); + log.error("检验任务数据000001: {}" + detail); // JSONObject result = JSONObject.parseObject(detail.toString()); // log.error("检验任务数据: {}"+ result.toJSONString()); // InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); @@ -145,13 +147,14 @@ public class InspectionTaskController extends BladeController { service.setDetailVOValue(detailDetailVO); return R.data(detailDetailVO); } + @PostMapping("/getPlateMsg") - public R getPlateMsg(@RequestBody InspectionTaskListVO detailDetail){ + public R getPlateMsg(@RequestBody InspectionTaskListVO detailDetail) { String prodIdent = detailDetail.getProdIdent(); List msgplateList = new ArrayList<>(); List msgplateAllList = new ArrayList<>(); //镀层提醒 - if(null != detailDetail.getPlateCode()){ + if (null != detailDetail.getPlateCode()) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(RemindMsg.class) .eq(RemindMsg::getPlateing, detailDetail.getPlateCode()) // .eq(RemindMsg::getQualityLevel, prodIdent) @@ -175,7 +178,7 @@ public class InspectionTaskController extends BladeController { // msgplateAllList = msgplateList; // } // } - }else{//如果零件里镀种代号为空 + } else {//如果零件里镀种代号为空 LambdaQueryWrapper qw = Wrappers.lambdaQuery(Plating.class) .eq(Plating::getPlating, detailDetail.getPlatingInfo()) .eq(Plating::getConfigNo, detailDetail.getConfigCode()) @@ -183,7 +186,7 @@ public class InspectionTaskController extends BladeController { .eq(Plating::getIsDeleted, CommonConstant.DELETE_FALSE) .orderByDesc(Plating::getId); List platingList = platingService.list(qw); - if(null != platingList && platingList.size() > 0){ + if (null != platingList && platingList.size() > 0) { Plating plating = platingList.get(0); LambdaQueryWrapper qw01 = Wrappers.lambdaQuery(RemindMsg.class) .eq(RemindMsg::getPlateing, plating.getPlateCode()) @@ -211,90 +214,90 @@ public class InspectionTaskController extends BladeController { } } RemindMsg msg = new RemindMsg(); - if(null != msgplateAllList && msgplateAllList.size() > 0){ + if (null != msgplateAllList && msgplateAllList.size() > 0) { msg = msgplateAllList.get(0); - if(null != detailDetail.getParam1()){ + if (null != detailDetail.getParam1()) { BigDecimal param1Up = msg.getParam1Up(); BigDecimal param1Down = msg.getParam1Down(); - if(null != param1Up && null != param1Down){ - if(detailDetail.getParam1().compareTo(param1Down) >=0 && detailDetail.getParam1().compareTo(param1Up) <=0){ + if (null != param1Up && null != param1Down) { + if (detailDetail.getParam1().compareTo(param1Down) >= 0 && detailDetail.getParam1().compareTo(param1Up) <= 0) { msg.setCheckParam1("0"); - }else{ + } else { msg.setCheckParam1("1"); } } - if(null != param1Up && null == param1Down){ - if(detailDetail.getParam1().compareTo(param1Up) <=0){ + if (null != param1Up && null == param1Down) { + if (detailDetail.getParam1().compareTo(param1Up) <= 0) { msg.setCheckParam1("0"); - }else{ + } else { msg.setCheckParam1("1"); } } - if(null == param1Up && null != param1Down){ - if(detailDetail.getParam1().compareTo(param1Down) >=0){ + if (null == param1Up && null != param1Down) { + if (detailDetail.getParam1().compareTo(param1Down) >= 0) { msg.setCheckParam1("0"); - }else{ + } else { msg.setCheckParam1("1"); } } } - if(null != detailDetail.getParam2()){ + if (null != detailDetail.getParam2()) { BigDecimal param2Up = msg.getParam2Up(); BigDecimal param2Down = msg.getParam2Down(); - if(null != param2Up && null != param2Down){ - if(detailDetail.getParam2().compareTo(param2Down) >=0 && detailDetail.getParam2().compareTo(param2Up) <=0){ + if (null != param2Up && null != param2Down) { + if (detailDetail.getParam2().compareTo(param2Down) >= 0 && detailDetail.getParam2().compareTo(param2Up) <= 0) { msg.setCheckParam2("0"); - }else{ + } else { msg.setCheckParam2("1"); } } - if(null != param2Up && null == param2Down){ - if(detailDetail.getParam2().compareTo(param2Up) <=0){ + if (null != param2Up && null == param2Down) { + if (detailDetail.getParam2().compareTo(param2Up) <= 0) { msg.setCheckParam2("0"); - }else{ + } else { msg.setCheckParam2("1"); } } - if(null == param2Up && null != param2Down){ - if(detailDetail.getParam2().compareTo(param2Down) >=0){ + if (null == param2Up && null != param2Down) { + if (detailDetail.getParam2().compareTo(param2Down) >= 0) { msg.setCheckParam2("0"); - }else{ + } else { msg.setCheckParam2("1"); } } } - if(null != detailDetail.getParam3()){ + if (null != detailDetail.getParam3()) { BigDecimal param3Up = msg.getParam3Up(); BigDecimal param3Down = msg.getParam3Down(); - if(null != param3Up && null != param3Down){ - if(detailDetail.getParam3().compareTo(param3Down) >=0 && detailDetail.getParam3().compareTo(param3Up) <=0){ + if (null != param3Up && null != param3Down) { + if (detailDetail.getParam3().compareTo(param3Down) >= 0 && detailDetail.getParam3().compareTo(param3Up) <= 0) { msg.setCheckParam3("0"); - }else{ + } else { msg.setCheckParam3("1"); } } - if(null != param3Up && null == param3Down){ - if(detailDetail.getParam3().compareTo(param3Up) <=0){ + if (null != param3Up && null == param3Down) { + if (detailDetail.getParam3().compareTo(param3Up) <= 0) { msg.setCheckParam3("0"); - }else{ + } else { msg.setCheckParam3("1"); } } - if(null == param3Up && null != param3Down){ - if(detailDetail.getParam3().compareTo(param3Down) >=0){ + if (null == param3Up && null != param3Down) { + if (detailDetail.getParam3().compareTo(param3Down) >= 0) { msg.setCheckParam3("0"); - }else{ + } else { msg.setCheckParam3("1"); } } } - }else{ + } else { msg.setCheckParam1("1"); msg.setCheckParam2("1"); msg.setCheckParam3("1"); @@ -304,7 +307,7 @@ public class InspectionTaskController extends BladeController { } @PostMapping("/getMaterialMsg") - public R getMaterialMsg(@RequestBody InspectionTaskListVO detailDetail){ + public R getMaterialMsg(@RequestBody InspectionTaskListVO detailDetail) { LambdaQueryWrapper qw01 = Wrappers.lambdaQuery(RemindMsg.class) .eq(RemindMsg::getFormula, detailDetail.getFormula()) .eq(RemindMsg::getIsDeleted, CommonConstant.DELETE_FALSE) @@ -312,28 +315,26 @@ public class InspectionTaskController extends BladeController { .orderByDesc(RemindMsg::getId); List msgMaterialList = remindMsgService.list(qw01); RemindMsg msg = new RemindMsg(); - if(null != msgMaterialList && msgMaterialList.size() > 0){ + if (null != msgMaterialList && msgMaterialList.size() > 0) { msg = msgMaterialList.get(0); String material = msg.getMaterial(); - if(null != detailDetail.getMaterial()){ - for(String mat : material.split("、")){ - if(detailDetail.getMaterial().contains(mat.trim())){ + if (null != detailDetail.getMaterial()) { + for (String mat : material.split("、")) { + if (detailDetail.getMaterial().contains(mat.trim())) { msg.setCheckMaterial("0"); break; - }else{ + } else { msg.setCheckMaterial("1"); } } } - }else{ + } else { msg.setCheckMaterial("1"); } return R.data(msg); } - - @GetMapping("/getItems") @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") @@ -377,7 +378,7 @@ public class InspectionTaskController extends BladeController { qw.eq("WP_ID", wpId); List list = service.list(qw); InspectionTask inspectionTask = new InspectionTask(); - if(null != list && list.size() > 0){ + if (null != list && list.size() > 0) { inspectionTask = list.get(0); } InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); @@ -388,8 +389,6 @@ public class InspectionTaskController extends BladeController { } - - /** * [检验任务] 分页 */ @@ -411,7 +410,7 @@ public class InspectionTaskController extends BladeController { if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { search.setFromType(null); } - if (BeanUtil.isEmpty(query) || (StrUtil.isEmpty(query.getAscs()) && StrUtil.isEmpty(query.getDescs()))){ + if (BeanUtil.isEmpty(query) || (StrUtil.isEmpty(query.getAscs()) && StrUtil.isEmpty(query.getDescs()))) { query.setDescs("create_time"); } IPage pagesVO = service.listSearch(Condition.getPage(query), search); @@ -421,7 +420,7 @@ public class InspectionTaskController extends BladeController { @GetMapping("/queryWorkOrder") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> queryWorkOrder(InspectionTaskSearch search,Query query) { + public R> queryWorkOrder(InspectionTaskSearch search, Query query) { log.info("search = {}", search); log.info("query = {}", query); log.info("getUserRole = {}", AuthUtil.getUserRole()); @@ -454,7 +453,7 @@ public class InspectionTaskController extends BladeController { Long woId = data.getLong("woId"); List planList = data.getJSONArray("planList").toJavaList(Boolean.class); // 工序 List moduleList = data.getJSONArray("moduleList").toJavaList(Boolean.class); // 模块 - JSONObject obj = service.newPagePrintEleFiles(woId, planList,moduleList); + JSONObject obj = service.newPagePrintEleFiles(woId, planList, moduleList); return R.data(obj); // return ResultInfo.ok(prWorkOrderService.newPagePrintEleFiles(woId, planList,moduleList)); } @@ -467,12 +466,12 @@ public class InspectionTaskController extends BladeController { List planList = new ArrayList<>(); List moduleList = new ArrayList<>(); - if(data.getJSONArray("planList") != null){ - planList= data.getJSONArray("planList").toJavaList(Boolean.class); // 工序 - moduleList= data.getJSONArray("moduleList").toJavaList(Boolean.class); // 模块 + if (data.getJSONArray("planList") != null) { + planList = data.getJSONArray("planList").toJavaList(Boolean.class); // 工序 + moduleList = data.getJSONArray("moduleList").toJavaList(Boolean.class); // 模块 } - Object pagePrintSjEleFiles = service.pagePrintSjEleFiles(woId, yieldType,planList,moduleList); + Object pagePrintSjEleFiles = service.pagePrintSjEleFiles(woId, yieldType, planList, moduleList); return R.data(pagePrintSjEleFiles); } @@ -532,14 +531,14 @@ public class InspectionTaskController extends BladeController { for (MesRbFilePreserveSlotEntity dsRbFilePreserveSlot : preserveSlotList) { List childrenListNew = new ArrayList<>(); - if(null != dsRbFilePreserveSlot.getInsertIndex()){ - if(Integer.parseInt(dsRbFilePreserveSlot.getInsertIndex()) > insertIndex){ + if (null != dsRbFilePreserveSlot.getInsertIndex()) { + if (Integer.parseInt(dsRbFilePreserveSlot.getInsertIndex()) > insertIndex) { insertIndex = Integer.parseInt(dsRbFilePreserveSlot.getInsertIndex()); } } childrenList = service.getByRfpsIdMesNew(dsRbFilePreserveSlot.getId()); - for(MesRbFilePreserveDetailEntity children : childrenList){ + for (MesRbFilePreserveDetailEntity children : childrenList) { MesRbFilePreserveDetailDTO childrenDTO = new MesRbFilePreserveDetailDTO(); BeanUtils.copyProperties(children, childrenDTO); childrenListNew.add(childrenDTO); @@ -547,11 +546,9 @@ public class InspectionTaskController extends BladeController { dsRbFilePreserveSlot.setChildrenList(childrenListNew); } } - preserveSlotList.sort(Comparator.comparing( - e -> Integer.parseInt(e.getSlotIndex()) - )); - obj.put("preserveSlotList",preserveSlotList); - obj.put("insertIndex",insertIndex); + preserveSlotList.sort(Comparator.comparing(MesRbFilePreserveSlotEntity::getSlotIndex)); + obj.put("preserveSlotList", preserveSlotList); + obj.put("insertIndex", insertIndex); return R.data(obj); } @@ -570,30 +567,30 @@ public class InspectionTaskController extends BladeController { .collect(Collectors.toList()); if (uniqueNames.size() != submitList.size()) { return R.fail("槽号名称不能重复"); - }else{ - for(MesRbFilePreserveSlotEntity slot : submitList){ - if(null != slot.getId()){ + } else { + for (MesRbFilePreserveSlotEntity slot : submitList) { + if (null != slot.getId()) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("slot_name", slot.getSlotName()); // queryWrapper.ne("id", slot.getId()); - if(null != deleteIds && deleteIds.size() > 0){ + if (null != deleteIds && deleteIds.size() > 0) { deleteIds.add(slot.getId()); queryWrapper.notIn("id", deleteIds); - }else{ + } else { queryWrapper.ne("id", slot.getId()); } List list = mesRbFilePreserveSlotService.list(queryWrapper); - if(null != list && list.size() > 0){ + if (null != list && list.size() > 0) { return R.fail("槽号名称不能重复"); } - }else{ + } else { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("slot_name", slot.getSlotName()); - if(null != deleteIds && deleteIds.size() > 0){ + if (null != deleteIds && deleteIds.size() > 0) { queryWrapper.notIn("id", deleteIds); } List list = mesRbFilePreserveSlotService.list(queryWrapper); - if(null != list && list.size() > 0){ + if (null != list && list.size() > 0) { return R.fail("槽号名称不能重复"); } } @@ -604,18 +601,16 @@ public class InspectionTaskController extends BladeController { } - BladeUser curUserInfo = AuthUtil.getUser(); // PfUserInfo curUserInfo = (PfUserInfo) ControllerUtils.getCurUserInfo(request); // Long rfpId = data.getLong("rfpId"); Long rfpId = dto.getRfpId(); - service.saveOrEditMes(submitList, deleteIds, curUserInfo, rfpId); + service.saveOrEditMes(submitList, deleteIds, curUserInfo, rfpId); return R.status(true); } - /** * [检验任务] 自定义分页 */ @@ -726,7 +721,7 @@ public class InspectionTaskController extends BladeController { qw.eq("TASK_ID", id); List listSheet = rsSubService.list(qw); - InspectionTask detail = service.getById( id); + InspectionTask detail = service.getById(id); WorkPlan workPlan = workPlanService.getOne(new QueryWrapper().lambda().eq(WorkPlan::getId, detail.getWpId())); // 根据workPlan的frontWpId（上一到工序ID）一直往上循环查询到cruxProcess为1的关键工序 if (workPlan != null && workPlan.getFrontWpId() != null) { @@ -734,7 +729,7 @@ public class InspectionTaskController extends BladeController { //（A→B→A） int maxIterations = 100; int iterations = 0; - while (Objects.nonNull(currentFrontWpId) && iterations < maxIterations) { + while (Objects.nonNull(currentFrontWpId) && iterations < maxIterations) { WorkPlan frontWorkPlan = workPlanService.getById(currentFrontWpId); if (BeanUtil.isEmpty(frontWorkPlan)) { break; @@ -749,13 +744,13 @@ public class InspectionTaskController extends BladeController { } } List list = new ArrayList<>(); - if(null != workPlan){ + if (null != workPlan) { list = macToolUseService.listSlotInfo(workPlan); - if(null != listSheet && listSheet.size() > 0){ + if (null != listSheet && listSheet.size() > 0) { list.forEach(one -> { one.setIsShow("1"); }); - }else{ + } else { list.forEach(one -> { one.setIsShow("0"); }); @@ -825,8 +820,8 @@ public class InspectionTaskController extends BladeController { QueryWrapper relmasterqw = new QueryWrapper<>(); relmasterqw.eq("PART_ID", partId); List relmasters = dsPartRelationService.list(relmasterqw); - if(null != relmasters && relmasters.size()>0){ - for(DsPartRelationEntity rel : relmasters){ + if (null != relmasters && relmasters.size() > 0) { + for (DsPartRelationEntity rel : relmasters) { DsPartEntity part = dsPartService.getById(rel.getChildPartId()); list.add(part); } @@ -841,8 +836,6 @@ public class InspectionTaskController extends BladeController { } - - @GetMapping("/toQaRecord") @ApiOperationSupport(order = 101) @Operation(summary = "跳转-质量记录", description = "传入inspectionTask id")