From df6159887f12c02763338c1e9a8a77f077858771 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 9 Oct 2025 10:43:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(mes,wms):=E4=BF=AE=E5=A4=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=BC=96=E7=A0=81=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改BaseMaterialInfoServiceImpl中的物料编码重复校验逻辑
- 使用JoinWrappers替换原有的buildQueryWrapper方法
- 确保物料编码精确匹配而非模糊匹配
- 避免因模糊匹配导致的误判重复问题
---
 .../mes/service/impl/BaseMaterialInfoServiceImpl.java        | 5 ++++-
 .../wms/service/impl/BaseMaterialInfoServiceImpl.java        | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java
index 4467892a..a6207072 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialInfoServiceImpl.java
@@ -203,7 +203,10 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
         if (StringUtils.isNotBlank(entity.getMaterialCode())) {
             BaseMaterialInfoBo query = new BaseMaterialInfoBo();
             query.setMaterialCode(entity.getMaterialCode());
-            MPJLambdaWrapper<BaseMaterialInfo> lqw = buildQueryWrapper(query);
+            MPJLambdaWrapper<BaseMaterialInfo> lqw = JoinWrappers.lambda(BaseMaterialInfo.class)
+                .selectAll(BaseMaterialInfo.class)
+                //buildQueryWrapper中getMaterialCodee是like，相似搜索
+                .eq(StringUtils.isNotBlank(query.getMaterialCode()), BaseMaterialInfo::getMaterialCode, query.getMaterialCode());
             BaseMaterialInfo baseMaterialInfo =  baseMapper.selectOne(lqw);
             if (!ObjectUtils.isEmpty(baseMaterialInfo)
                 && !baseMaterialInfo.getMaterialId().equals(entity.getMaterialId())) {
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java
index 00391b95..6aa6689a 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java
@@ -211,7 +211,10 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
         if (StringUtils.isNotBlank(entity.getMaterialCode())) {
             BaseMaterialInfoBo query = new BaseMaterialInfoBo();
             query.setMaterialCode(entity.getMaterialCode());
-            MPJLambdaWrapper<BaseMaterialInfo> lqw = buildQueryWrapper(query);
+            MPJLambdaWrapper<BaseMaterialInfo> lqw = JoinWrappers.lambda(BaseMaterialInfo.class)
+                .selectAll(BaseMaterialInfo.class)
+                //buildQueryWrapper中getMaterialCodee是like，相似搜索
+                .eq(StringUtils.isNotBlank(query.getMaterialCode()), BaseMaterialInfo::getMaterialCode, query.getMaterialCode());
             BaseMaterialInfo baseMaterialInfo =  baseMapper.selectOne(lqw);
             if (!ObjectUtils.isEmpty(baseMaterialInfo)
                 && !baseMaterialInfo.getMaterialId().equals(entity.getMaterialId())) {