From df9a872af35883a0d6019e81b68611ef9e5010c8 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 28 Mar 2025 13:43:53 +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 | 47 +++++++++++++++----
 1 file changed, 37 insertions(+), 10 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 ba596196..1b183c89 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
@@ -9,7 +9,11 @@ import com.hzya.frame.plugin.zjmaterielsynchronizationevent.entity.ZjMaterielSyn
 import com.hzya.frame.plugin.zjmaterielsynchronizationevent.service.IZjMaterielSynchronizationEventService;
 import com.hzya.frame.u8.base.inventory.dao.IInventoryDao;
 import com.hzya.frame.u8.base.inventory.entity.InventoryEntity;
+import com.hzya.frame.u8.base.inventory.entity.InventoryExtEntity;
+import com.hzya.frame.u8.base.inventory.entity.InventorySubEntity;
+import com.hzya.frame.u8.base.inventory.service.IInventoryExtService;
 import com.hzya.frame.u8.base.inventory.service.IInventoryService;
+import com.hzya.frame.u8.base.inventory.service.IInventorySubService;
 import com.hzya.frame.u8.base.inventory.service.impl.InventoryService;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
@@ -17,6 +21,7 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.annotation.Resource;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -44,7 +49,10 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
         this.zjMaterielSynchronizationEventDao = zjMaterielSynchronizationEventDao;
         this.dao = zjMaterielSynchronizationEventDao;
     }
-
+    @Resource
+    private IInventoryExtService inventoryExtService;
+    @Autowired
+    private IInventorySubService iInventorySubService;
     @Autowired
     private IInventoryDao inventoryDao;
     @Autowired
@@ -52,6 +60,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
     private String zjoa = "zjoa";
     private String zju8 = "zju8";
     private JSONObject setdata() {
+        //-8326794273716286834
         String str = "{\n" +
                 "\t\"businessDataStr\": \"{\\\"formId\\\":\\\"-3905612378317895950\\\",\\\"systemRelationRecords\\\":[],\\\"formmain_0274\\\":{\\\"field0029\\\":\\\"1421502140902557985\\\",\\\"id\\\":\\\"-8326794273716286834\\\",\\\"state\\\":0,\\\"modify_member_id\\\":\\\"1421502140902557985\\\",\\\"start_date\\\":\\\"2025-03-17 14:31:41\\\",\\\"field0021\\\":\\\"2025-03-17 00:00:00\\\",\\\"ratifyflag\\\":0,\\\"sort\\\":0,\\\"ratify_member_id\\\":\\\"0\\\",\\\"start_member_id\\\":\\\"1421502140902557985\\\",\\\"approve_member_id\\\":\\\"0\\\",\\\"finishedflag\\\":0,\\\"modify_date\\\":\\\"2025-03-17 14:32:08\\\"},\\\"formson_0275\\\":[{\\\"field0032\\\":\\\"1421502140902557985\\\",\\\"field0033\\\":\\\"-8742017848273975919\\\",\\\"field0012\\\":\\\"1992327618862992707\\\",\\\"formmain_id\\\":\\\"-1172979993326564802\\\",\\\"field0013\\\":\\\"111\\\",\\\"field0038\\\":\\\"6978528383202511421\\\",\\\"field0006\\\":\\\"单面PCB\\\",\\\"field0007\\\":\\\"测试01\\\",\\\"field0008\\\":\\\"-7484130195468762590\\\",\\\"id\\\":\\\"5166621963325295705\\\",\\\"field0042\\\":\\\"2373467247970043294\\\",\\\"field0043\\\":\\\"12001-单面板\\\",\\\"field0022\\\":\\\"-2945823222932814225\\\",\\\"field0044\\\":\\\"1\\\",\\\"field0047\\\":\\\"7938221701373775446\\\",\\\"field0004\\\":\\\"1\\\",\\\"field0048\\\":\\\"-2560084027973350816\\\",\\\"sort\\\":\\\"1\\\",\\\"field0040\\\":\\\"3672918071318364920\\\",\\\"groupsort\\\":1,\\\"field0017\\\":\\\"-3057298014166890271\\\",\\\"field0018\\\":\\\"6370474688113429014\\\"},{\\\"field0032\\\":\\\"1421502140902557985\\\",\\\"field0012\\\":\\\"4344562897656367384\\\",\\\"formmain_id\\\":\\\"-1172979993326564802\\\",\\\"field0013\\\":\\\"111\\\",\\\"field0015\\\":\\\"修改型号、品牌、工艺属性、仓库名称、优选等级、物料属性、吉朗单位\\\",\\\"field0038\\\":\\\"6978528383202511421\\\",\\\"field0006\\\":\\\"双面PCB\\\",\\\"field0007\\\":\\\"测试02\\\",\\\"field0008\\\":\\\"3945246438468764198\\\",\\\"id\\\":\\\"4426722915502541386\\\",\\\"field0042\\\":\\\"5516680321955287005\\\",\\\"field0043\\\":\\\"12003-双面板\\\",\\\"field0022\\\":\\\"-2945823222932814225\\\",\\\"field0044\\\":\\\"1\\\",\\\"field0047\\\":\\\"7938221701373775446\\\",\\\"field0004\\\":\\\"2\\\",\\\"field0048\\\":\\\"-4037029836424066587\\\",\\\"field0005\\\":\\\"12003000100\\\",\\\"sort\\\":\\\"2\\\",\\\"field0040\\\":\\\"-922480551664794340\\\",\\\"groupsort\\\":1,\\\"field0017\\\":\\\"-8754053652716436337\\\",\\\"field0018\\\":\\\"2022562015180964941\\\"},{\\\"field0032\\\":\\\"1421502140902557985\\\",\\\"field0033\\\":\\\"-8742017848273975919\\\",\\\"field0012\\\":\\\"1992327618862992707\\\",\\\"formmain_id\\\":\\\"-1172979993326564802\\\",\\\"field0013\\\":\\\"111\\\",\\\"field0038\\\":\\\"6978528383202511421\\\",\\\"field0006\\\":\\\"多层板\\\",\\\"field0007\\\":\\\"测试03\\\",\\\"field0008\\\":\\\"-7484130195468762590\\\",\\\"id\\\":\\\"6700217056720145510\\\",\\\"field0042\\\":\\\"2373467247970043294\\\",\\\"field0043\\\":\\\"12005-多层板\\\",\\\"field0022\\\":\\\"-2945823222932814225\\\",\\\"field0044\\\":\\\"1\\\",\\\"field0047\\\":\\\"7938221701373775446\\\",\\\"field0004\\\":\\\"3\\\",\\\"field0048\\\":\\\"-2560084027973350816\\\",\\\"field0005\\\":\\\"12005000101\\\",\\\"sort\\\":\\\"3\\\",\\\"field0040\\\":\\\"3672918071318364920\\\",\\\"groupsort\\\":1,\\\"field0017\\\":\\\"-3057298014166890271\\\",\\\"field0018\\\":\\\"-8051278170201109560\\\"},{\\\"field0032\\\":\\\"1421502140902557985\\\",\\\"field0033\\\":\\\"1524430637576637930\\\",\\\"field0034\\\":\\\"1729652777585822779\\\",\\\"formmain_id\\\":\\\"-1172979993326564802\\\",\\\"field0013\\\":\\\"111\\\",\\\"field0015\\\":\\\"修改型号、开发号、产品阶段、客户名、仓库名称\\\",\\\"field0038\\\":\\\"6978528383202511421\\\",\\\"field0006\\\":\\\"遥控板\\\",\\\"field0007\\\":\\\"测试04\\\",\\\"id\\\":\\\"-1866281705366601123\\\",\\\"field0042\\\":\\\"5516680321955287005\\\",\\\"field0043\\\":\\\"62103-工业变频驱动板\\\",\\\"field0044\\\":\\\"6\\\",\\\"field0047\\\":\\\"-7621841196549452634\\\",\\\"field0004\\\":\\\"4\\\",\\\"field0048\\\":\\\"-2560084027973350816\\\",\\\"field0005\\\":\\\"62100000211\\\",\\\"sort\\\":\\\"4\\\",\\\"field0040\\\":\\\"736429965137036948\\\",\\\"groupsort\\\":1,\\\"field0039\\\":\\\"XM-20180038\\\",\\\"field0018\\\":\\\"2022562015180964941\\\"},{\\\"field0032\\\":\\\"1421502140902557985\\\",\\\"field0012\\\":\\\"1992327618862992707\\\",\\\"formmain_id\\\":\\\"-1172979993326564802\\\",\\\"field0013\\\":\\\"111\\\",\\\"field0038\\\":\\\"6978528383202511421\\\",\\\"field0006\\\":\\\"轻触开关\\\",\\\"field0007\\\":\\\"测试05\\\",\\\"field0008\\\":\\\"1901179953174168965\\\",\\\"id\\\":\\\"7404795553887307250\\\",\\\"field0042\\\":\\\"5516680321955287005\\\",\\\"field0043\\\":\\\"12600-轻触开关\\\",\\\"field0022\\\":\\\"-2945823222932814225\\\",\\\"field0044\\\":\\\"1\\\",\\\"field0047\\\":\\\"-7621841196549452634\\\",\\\"field0004\\\":\\\"5\\\",\\\"field0048\\\":\\\"-2560084027973350816\\\",\\\"field0005\\\":\\\"12600000111\\\",\\\"sort\\\":\\\"5\\\",\\\"field0040\\\":\\\"3672918071318364920\\\",\\\"groupsort\\\":1,\\\"field0017\\\":\\\"-8754053652716436337\\\",\\\"field0018\\\":\\\"-534873453094682532\\\"},{\\\"field0032\\\":\\\"1421502140902557985\\\",\\\"field0033\\\":\\\"-8742017848273975919\\\",\\\"field0034\\\":\\\"-7717856120092735875\\\",\\\"formmain_id\\\":\\\"-1172979993326564802\\\",\\\"field0013\\\":\\\"111\\\",\\\"field0038\\\":\\\"6978528383202511421\\\",\\\"field0006\\\":\\\"传感器板\\\",\\\"field0007\\\":\\\"测试06_RI\\\",\\\"id\\\":\\\"-2951518770830882969\\\",\\\"field0042\\\":\\\"5516680321955287005\\\",\\\"field0043\\\":\\\"62915-传感器板\\\",\\\"field0044\\\":\\\"6\\\",\\\"field0047\\\":\\\"-7621841196549452634\\\",\\\"field0004\\\":\\\"6\\\",\\\"field0048\\\":\\\"-2560084027973350816\\\",\\\"sort\\\":\\\"6\\\",\\\"field0040\\\":\\\"-922480551664794340\\\",\\\"groupsort\\\":1,\\\"field0039\\\":\\\"XM-20200034\\\",\\\"field0018\\\":\\\"6370474688113429014\\\"},{\\\"field0032\\\":\\\"1421502140902557985\\\",\\\"field0033\\\":\\\"-8742017848273975919\\\",\\\"field0034\\\":\\\"-7717856120092735875\\\",\\\"formmain_id\\\":\\\"-1172979993326564802\\\",\\\"field0013\\\":\\\"111\\\",\\\"field0038\\\":\\\"6978528383202511421\\\",\\\"field0006\\\":\\\"传感器板\\\",\\\"field0007\\\":\\\"测试06\\\",\\\"id\\\":\\\"1340651432790608074\\\",\\\"field0042\\\":\\\"5516680321955287005\\\",\\\"field0043\\\":\\\"72915-传感器板\\\",\\\"field0044\\\":\\\"7\\\",\\\"field0047\\\":\\\"-7621841196549452634\\\",\\\"field0004\\\":\\\"7\\\",\\\"field0048\\\":\\\"-2560084027973350816\\\",\\\"sort\\\":\\\"7\\\",\\\"field0040\\\":\\\"2317333171132055743\\\",\\\"groupsort\\\":1,\\\"field0039\\\":\\\"XM-20200034\\\",\\\"field0018\\\":\\\"6370474688113429014\\\"}],\\\"relationRecords\\\":[{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0043\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"5166621963325295705\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9186490075385345640\\\",\\\"toFormId\\\":\\\"-1932967999249168761\\\",\\\"toMasterDataId\\\":\\\"3163007693784369626\\\",\\\"id\\\":\\\"-3977344269764441491\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0043\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"4426722915502541386\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9186490075385345640\\\",\\\"toFormId\\\":\\\"-1932967999249168761\\\",\\\"toMasterDataId\\\":\\\"5448927498492528800\\\",\\\"id\\\":\\\"3574938246926517342\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0043\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"6700217056720145510\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9186490075385345640\\\",\\\"toFormId\\\":\\\"-1932967999249168761\\\",\\\"toMasterDataId\\\":\\\"-768818563401364880\\\",\\\"id\\\":\\\"-8423571161708672740\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0043\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"-1866281705366601123\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9186490075385345640\\\",\\\"toFormId\\\":\\\"-1932967999249168761\\\",\\\"toMasterDataId\\\":\\\"-9215057759836618178\\\",\\\"id\\\":\\\"3664856462452212445\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0039\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"-1866281705366601123\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9115049651476019855\\\",\\\"toFormId\\\":\\\"1384236263744228883\\\",\\\"toMasterDataId\\\":\\\"816438522350684751\\\",\\\"id\\\":\\\"-4632848363322718906\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0043\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"7404795553887307250\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9186490075385345640\\\",\\\"toFormId\\\":\\\"-1932967999249168761\\\",\\\"toMasterDataId\\\":\\\"7941582905197678345\\\",\\\"id\\\":\\\"-6536401734594246184\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0043\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"-2951518770830882969\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9186490075385345640\\\",\\\"toFormId\\\":\\\"-1932967999249168761\\\",\\\"toMasterDataId\\\":\\\"-3706538923009948594\\\",\\\"id\\\":\\\"4066538004526941978\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0039\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"-2951518770830882969\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9115049651476019855\\\",\\\"toFormId\\\":\\\"1384236263744228883\\\",\\\"toMasterDataId\\\":\\\"-7683158415127722983\\\",\\\"id\\\":\\\"-3215076937339025930\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0043\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"1340651432790608074\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9186490075385345640\\\",\\\"toFormId\\\":\\\"-1932967999249168761\\\",\\\"toMasterDataId\\\":\\\"5216419279699984943\\\",\\\"id\\\":\\\"4265259303971143729\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"},{\\\"toSubDataId\\\":\\\"\\\",\\\"formType\\\":\\\"42\\\",\\\"fromFormId\\\":\\\"-3905612378317895950\\\",\\\"fieldName\\\":\\\"field0039\\\",\\\"fromMasterDataId\\\":\\\"-1172979993326564802\\\",\\\"dataInfo\\\":\\\"{\\\\\\\"pcView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"phoneView\\\\\\\":\\\\\\\"\\\\\\\",\\\\\\\"toVersion\\\\\\\":\\\\\\\"default_form\\\\\\\"}\\\",\\\"fromSubDataId\\\":\\\"1340651432790608074\\\",\\\"type\\\":\\\"1\\\",\\\"viewThrough\\\":\\\"0\\\",\\\"relationShipId\\\":\\\"-9115049651476019855\\\",\\\"toFormId\\\":\\\"1384236263744228883\\\",\\\"toMasterDataId\\\":\\\"-7683158415127722983\\\",\\\"id\\\":\\\"5954828029495822484\\\",\\\"memberId\\\":\\\"1421502140902557985\\\"}]}\",\n" +
                 "\t\"formApp\": \"5784297048514708594\",\n" +
@@ -166,6 +175,9 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
 
         for (int i = 0; i < list.size(); i++) {
             ZjMaterielSynchronizationEventEntity entity = list.get(i);
+            InventoryExtEntity inventoryExtEntity = new InventoryExtEntity();
+            InventorySubEntity inventorySubEntity = new InventorySubEntity();
+
             //获取最大流水号
             Integer maxnum = null;
             if(lsh.get(entity.getField0043code()) != null){
@@ -284,6 +296,16 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                 if(queryCzList != null && queryCzList.size() > 0){
                     BeanUtils.copyProperties(inventoryEntity,queryCzList.get(0));
                 }
+                inventoryExtEntity.setDataSourceCode(zju8);
+                inventoryExtEntity.setcInvCode(entity.getField0005());
+                inventoryExtEntity = inventoryExtService.getInvExt(inventoryExtEntity);
+                inventoryExtEntity.setDataSourceCode(zju8);
+
+                inventorySubEntity.setDataSourceCode(zju8);
+                inventorySubEntity.setcInvSubCode(entity.getField0005());
+                inventorySubEntity = iInventorySubService.getInvSub(inventorySubEntity);
+                inventoryExtEntity.setDataSourceCode(zju8);
+
             }else {
                 for (int i1 = 0; i1 < inventoryEntities.size(); i1++) {
                     if(inventoryEntities.get(i1).getcInvCode().equals(entity.getField0043code())){
@@ -291,7 +313,15 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                         break;
                     }
                 }
+                inventoryExtEntity.setDataSourceCode(zju8);
+                inventoryExtEntity.setcInvCode(entity.getField0043code());
+                inventoryExtEntity = inventoryExtService.getInvExt(inventoryExtEntity);
+                inventorySubEntity.setDataSourceCode(zju8);
+                inventorySubEntity.setcInvSubCode(entity.getField0043code());
+                inventorySubEntity = iInventorySubService.getInvSub(inventorySubEntity);
             }
+            inventoryExtEntity.setcInvCode(wlcode.toString());
+            inventorySubEntity.setcInvSubCode(wlcode.toString());
             entity.setField0005(wlcode.toString());
             //定制化字段
             inventoryEntity.setDataSourceCode(zju8);
@@ -306,9 +336,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
             inventoryEntity.setcInvAddCode(entity.getField0045());//  货品代码
             inventoryEntity.setcInvName(entity.getField0006());//  货品名称
             inventoryEntity.setcInvStd(entity.getField0007());//  货品规格
-
-                inventoryEntity.setcInvDefine8(entity.getField0008code());//  品牌  SPT
-
+            inventoryEntity.setcInvDefine8(entity.getField0008code());//  品牌  SPT
             inventoryEntity.setcInvDefine3(entity.getField0017code());//  工艺属性 A贴片类
             inventoryEntity.setcDefWareHouse(entity.getField0040code());//   仓库名称
             inventoryEntity.setcInvDefine1(entity.getField0012code());// 优选等级  合格
@@ -321,12 +349,11 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                 inventoryEntity.setbProxyForeign("0");//  是否委外
                 inventoryEntity.setbPurchase("0");//  计划属性
             }
-
-            inventoryEntity.setcInvDefine8(entity.getField0034code());//  客户名
-            inventoryEntity.setcInvCCode(entity.getField0032code());// todo 负责人
-            inventoryEntity.setbSrvItem(entity.getField0039());// todo 开发号/项目
-
-
+            inventoryExtEntity.setCidefine6(entity.getField0034code());// 客户名
+            inventoryExtEntity.setCidefine1(entity.getField0032code());//负责人
+            inventoryExtEntity.setCidefine2(entity.getField0039());// 开发号/项目
+            inventoryEntity.setInvExtEntity(inventoryExtEntity);
+            inventoryEntity.setInvSubEntity(inventorySubEntity);
             savedata.add(inventoryEntity);
             if("新增".equals(entity.getField0018code()) || "增加替代".equals(entity.getField0018code()) || "升级".equals(entity.getField0018code())){
                 iInventoryService.saveInventory(inventoryEntity);