From 276f2cc6e682cd1add221adde1d712d2ffb4cf00 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Thu, 27 Mar 2025 10:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...terielSynchronizationEventServiceImpl.java | 20 ++++++++++++++-----
 .../base/inventory/entity/InventoryEntity.xml |  1 -
 2 files changed, 15 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 0d808515..ade679ab 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
@@ -276,10 +276,20 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
             //物料编码
             InventoryEntity inventoryEntity = new InventoryEntity();
             //设置全部字段属性
-            for (int i1 = 0; i1 < inventoryEntities.size(); i1++) {
-                if(inventoryEntities.get(i1).getcInvCode().equals(entity.getField0043code())){
-                    BeanUtils.copyProperties(inventoryEntity,inventoryEntities.get(i1));
-                    break;
+            if("修改".equals(entity.getField0018code())){
+                InventoryEntity queryCz = new InventoryEntity();
+                queryCz.setDataSourceCode(zju8);
+                queryCz.setcInvCode(entity.getField0005());
+                List<InventoryEntity> queryCzList = inventoryDao.query(queryCz);
+                if(queryCzList != null && queryCzList.size() > 0){
+                    BeanUtils.copyProperties(inventoryEntity,queryCzList.get(0));
+                }
+            }else {
+                for (int i1 = 0; i1 < inventoryEntities.size(); i1++) {
+                    if(inventoryEntities.get(i1).getcInvCode().equals(entity.getField0043code())){
+                        BeanUtils.copyProperties(inventoryEntity,inventoryEntities.get(i1));
+                        break;
+                    }
                 }
             }
             entity.setField0005(wlcode.toString());
@@ -299,7 +309,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
             //inventoryEntity.setcInvCCode(entity.getField0008code());// todo 品牌
             //inventoryEntity.setcInvCCode(entity.getField0034code());// todo 客户名
             //inventoryEntity.setcInvCCode(entity.getField0017code());// todo 工艺属性
-            inventoryEntity.setcDefWareHouse(entity.getField0040code());//   仓库名称(值需要转换)
+            inventoryEntity.setcDefWareHouse(entity.getField0040code());//   仓库名称
             //inventoryEntity.setcInvCCode(entity.getField0012code());// todo 优选等级
             //inventoryEntity.setbSrvItem(entity.getField0039());// todo 开发号(值需要转换)
             //inventoryEntity.setcInvCCode(entity.getField0042code());// todo 物料属性
diff --git a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.xml b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.xml
index c8a58566..ceced58c 100644
--- a/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.xml
+++ b/fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.xml
@@ -2416,7 +2416,6 @@
             <if test="cInvDefine1 != null and cInvDefine1 !='' "> cInvDefine1 = #{cInvDefine1},</if>
             <if test="cInvDefine2 != null and cInvDefine2 !='' "> cInvDefine2 = #{cInvDefine2},</if>
             <if test="cInvDefine3 != null and cInvDefine3 !='' "> cInvDefine3 = #{cInvDefine3},</if>
-            <if test="I_id != null ">I_id = #{I_id},</if>
             <if test="bInvType != null and bInvType !='' "> bInvType = #{bInvType},</if>
             <if test="iInvMPCost != null ">iInvMPCost = #{iInvMPCost},</if>
             <if test="cQuality != null and cQuality !='' "> cQuality = #{cQuality},</if>