From 4f34e267d7a4fb297c45b5ebda6f13ca28a4b86d Mon Sep 17 00:00:00 2001 From: zc Date: Fri, 3 Apr 2026 17:31:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B5=81=E7=A8=8B=E6=95=B4?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/model/entity/MaterialInfoDO.java | 4 ++-- .../model/req/MaterialImportRowReq.java | 4 ++-- .../material/model/req/MaterialInfoReq.java | 4 ++-- .../material/model/resp/MaterialInfoResp.java | 13 +++---------- .../service/impl/MaterialInfoServiceImpl.java | 18 ++---------------- .../resources/mapper/MeterialInfoMapper.xml | 8 ++------ .../controller/vm/VmCommandController.java | 13 ++++--------- 7 files changed, 17 insertions(+), 47 deletions(-) diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java index 677eb3a..004d4ee 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java @@ -53,9 +53,9 @@ public class MaterialInfoDO extends BaseDO { private Long materialTypeId; /** - * 流程ID + * 物料流程 */ - private Long materialProcessId; + private String materialProcess; /** * 灯光等级 diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java index fcfa96d..30d8ac3 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialImportRowReq.java @@ -60,7 +60,7 @@ public class MaterialImportRowReq implements Serializable { /** * 流程名称 */ - @Schema(description = "流程名称") - private String processName; + @Schema(description = "物料流程") + private String materialProcess; } diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java index c5011dd..dd7b88a 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java @@ -71,8 +71,8 @@ public class MaterialInfoReq implements Serializable { * 流程ID */ @Schema(description = "流程ID") - @NotNull(message = "流程ID不能为空") - private Long materialProcessId; + @NotBlank(message = "流程ID不能为空") + private String materialProcess; /** * 灯光等级 diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java index 2cfe5be..31bd33b 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java @@ -66,11 +66,11 @@ public class MaterialInfoResp extends BaseDetailResp { private String typeName; /** - * 流程名称 + * 物料流程 */ - @Schema(description = "流程名称") + @Schema(description = "物料流程") @ExcelProperty(value = "物料流程") - private String processName; + private String materialProcess; /** * 物料类型ID @@ -79,13 +79,6 @@ public class MaterialInfoResp extends BaseDetailResp { @ExcelIgnore private Long materialTypeId; - /** - * 流程ID - */ - @Schema(description = "流程ID") - @ExcelIgnore - private Long materialProcessId; - /** * 品类下行浮动范围（%） */ diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index 112570b..65e5279 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -51,7 +51,6 @@ import top.wms.admin.material.model.resp.MaterialImportParseResp; import top.wms.admin.material.model.resp.MaterialInfoImportResp; import top.wms.admin.material.model.resp.MaterialInfoResp; import top.wms.admin.material.service.MaterialInfoService; -import top.wms.admin.materialProcess.mapper.MaterialProcessMapper; import top.wms.admin.materialProcess.model.entity.MaterialProcessDO; import top.wms.admin.materialType.mapper.MaterialTypeMapper; import top.wms.admin.materialType.model.entity.MaterialTypeDO; @@ -87,8 +86,6 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl page(MaterialInfoQuery query, PageQuery pageQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -218,18 +215,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl v1)); } - //查询物料流程 - List collect1 = importMaterialList.stream() - .map(MaterialImportRowReq::getProcessName) - .distinct() - .toList(); - List materialProcessList = materialProcessMapper - .selectList(new LambdaQueryWrapper().in(MaterialProcessDO::getProcessName, collect1)); - Map materialProcessMap = new HashMap<>(); - if (CollUtil.isNotEmpty(materialProcessList)) { - materialProcessMap = materialProcessList.stream() - .collect(Collectors.toMap(MaterialProcessDO::getProcessName, MaterialProcessDO::getId, (k1, v1) -> v1)); - } + //处理灯光等级 Map lightLevelMap = new HashMap<>(); importMaterialList.forEach(row -> { @@ -253,7 +239,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl SELECT mi.*, - mt.type_name typeName, - mp.process_name processName + mt.type_name typeName FROM sys_material_info mi left join sys_material_type mt on mi.material_type_id = mt.id - left join sys_material_process mp on mi.material_process_id = mp.id ${ew.customSqlSegment} diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java index 29b4d21..26d83e1 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/vm/VmCommandController.java @@ -22,16 +22,11 @@ public class VmCommandController { @Autowired private SimpleRequestMatcher requestMatcher; - @Autowired - private MaterialProcessMapper materialProcessMapper; - @PostMapping("/send") public String sendAndWait(@RequestBody JSONObject js) { - String msg = js.getString("msg"); - log.info("开始比对物料编码: {}", msg); - String processCode = materialProcessMapper.getCodeByMaterial(msg); - log.info("物料流程编码: {}", processCode); - CheckUtils.throwIf(StrUtil.isBlank(processCode), "未查询到物料流程编码"); + String materialProcess = js.getString("materialProcess"); + log.info("开始比对: {}", materialProcess); + CheckUtils.throwIf(StrUtil.isBlank(materialProcess), "物料流程编码不能为空"); // 1. 检查连接 Channel channel = channelManager.getFirstChannel(); @@ -40,7 +35,7 @@ public class VmCommandController { } // 2. 清空之前的响应队列，避免影响当前请求 requestMatcher.clear(); - channel.writeAndFlush(msg); + channel.writeAndFlush(materialProcess); // 3. 等待响应 String response = requestMatcher.waitForResponse(20); log.info("sendAndWait-收到响应: {}", response);