From 493f5fbe33f0c3dd068091d8e0fde30febb257ed Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Tue, 20 May 2025 17:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AF=B9=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ZjMaterielSynchronizationEventServiceImpl.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java
index 351eece7..3a32257e 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/service/impl/ZjMaterielSynchronizationEventServiceImpl.java
@@ -942,7 +942,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
             if(entity.getField0005() != null && !"".equals(entity.getField0005())
                 && entity.getField0045() != null && !"".equals(entity.getField0045())){
                 if(!entity.getField0005().equals(entity.getField0045())){
-                    str.append("序号为"+entity.getField0004()+"明细行的物料编码和货品代码不一致。");
+                    //str.append("序号为"+entity.getField0004()+"明细行的物料编码和货品代码不一致。");
 
                     //return BaseResult.getFailureMessageEntity("序号为"+entity.getField0004()+"明细行的物料编码和货品代码不一致");
                 }
@@ -1051,17 +1051,15 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                         str.append(entity.getField0005()+"在U8中不存在,请检查货品编号"+"。");
 
                     }
-
                 }else if("增加替代".equals(entity.getField0018code()) || "升级".equals(entity.getField0018code())){
                     //查询u8物料
                     InventoryEntity queryCz = new InventoryEntity();
                     queryCz.setDataSourceCode(zju8);
                     queryCz.setcInvCode(entity.getField0005());
                     List<InventoryEntity> queryCzList = inventoryDao.query(queryCz);
-                    if(queryCzList == null || queryCzList.size() == 0 ){
+                    if(queryCzList != null && queryCzList.size() > 0 ){
                         //return BaseResult.getFailureMessageEntity("序号为"+entity.getField0004()+"明细行修改的物料编码在U8中不存在");
-                        str.append(entity.getField0005()+"在U8中不存在,请检查货品编号"+"。");
-
+                        str.append(entity.getField0005()+"在U8中已存在,请检查货品编号"+"。");
                     }
                 }else {//新增
                     xzCount++;