From 5f86b1c90949ff67c2def31e31975a29886c06f3 Mon Sep 17 00:00:00 2001 From: zc Date: Fri, 3 Apr 2026 16:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialProcess/mapper/MaterialProcessMapper.java | 2 ++ .../main/resources/mapper/MaterialProcessMapper.xml | 7 +++++++ .../wms/admin/controller/vm/VmCommandController.java | 10 +++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/wms-module-system/src/main/java/top/wms/admin/materialProcess/mapper/MaterialProcessMapper.java b/wms-module-system/src/main/java/top/wms/admin/materialProcess/mapper/MaterialProcessMapper.java index fe64315..c37edb8 100644 --- a/wms-module-system/src/main/java/top/wms/admin/materialProcess/mapper/MaterialProcessMapper.java +++ b/wms-module-system/src/main/java/top/wms/admin/materialProcess/mapper/MaterialProcessMapper.java @@ -19,4 +19,6 @@ public interface MaterialProcessMapper extends BaseMapper { void updateByName(@Param("list") List updateByNameList); void updateByCode(@Param("list") List updateByCodeList); + + String getCodeByMaterial(@Param("materialCode") String materialCode); } \ No newline at end of file diff --git a/wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml b/wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml index 7048785..5b0cc44 100644 --- a/wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml +++ b/wms-module-system/src/main/resources/mapper/MaterialProcessMapper.xml @@ -59,4 +59,11 @@ #{item.processCode} + + \ No newline at end of file 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 df9ce1d..29b4d21 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 @@ -1,5 +1,6 @@ package top.wms.admin.controller.vm; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; @@ -8,6 +9,7 @@ import org.springframework.web.bind.annotation.*; import top.continew.starter.core.validation.CheckUtils; import top.wms.admin.controller.tcp.config.SimpleRequestMatcher; import top.wms.admin.controller.tcp.manager.ChannelManager; +import top.wms.admin.materialProcess.mapper.MaterialProcessMapper; @Slf4j @RestController @@ -20,10 +22,16 @@ 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); + log.info("开始比对物料编码: {}", msg); + String processCode = materialProcessMapper.getCodeByMaterial(msg); + log.info("物料流程编码: {}", processCode); + CheckUtils.throwIf(StrUtil.isBlank(processCode), "未查询到物料流程编码"); // 1. 检查连接 Channel channel = channelManager.getFirstChannel();