From e90e0e7db68d8b852b9ccf2c54034e1261297c0c Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 11 Apr 2025 14:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ZjMaterielSynchronizationEventServiceImpl.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 c12997ae..0fe5a7b6 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
@@ -585,11 +585,11 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                     return BaseResult.getFailureMessageEntity("序号为"+entity.getField0004()+"明细行的货品编码为空");
                 }
             }
-            if(flag){
-                if(entity.getField0045() == null || "".equals(entity.getField0045())){
-                    return BaseResult.getFailureMessageEntity("序号为"+entity.getField0004()+"明细行的货品代码为空");
-                }
-            }
+            //if(flag){
+            //    if(entity.getField0045() == null || "".equals(entity.getField0045())){
+            //        return BaseResult.getFailureMessageEntity("序号为"+entity.getField0004()+"明细行的货品代码为空");
+            //    }
+            //}
             //if(flag){
             //    if(entity.getField0008code() == null || "".equals(entity.getField0008code())){
             //        return BaseResult.getFailureMessageEntity("序号为"+entity.getField0004()+"明细行的品牌为空");
@@ -688,7 +688,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                     List<InventoryEntity> queryCzList = inventoryDao.query(queryCz);
                     if(queryCzList == null || queryCzList.size() == 0 ){
                         //return BaseResult.getFailureMessageEntity("序号为"+entity.getField0004()+"明细行修改的物料编码在U8中不存在");
-                        return BaseResult.getFailureMessageEntity(entity.getField0005()+"已存在U8中不存在,请检查货品编号");
+                        return BaseResult.getFailureMessageEntity(entity.getField0005()+"在U8中不存在,请检查货品编号");
                     }
 
                 }else {//新增/增加替代/升级