From 21e612533e5ee4900bb8ffe369be907655e2c30f Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Fri, 11 Apr 2025 18:10:03 +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

---
 .../ZjMaterielSynchronizationEventEntity.java | 19 +++++++++++++++++-
 .../ZjMaterielSynchronizationEventEntity.xml  |  1 +
 ...terielSynchronizationEventServiceImpl.java | 20 ++++++++++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java
index 988e704a..fd61371e 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.java
@@ -69,7 +69,8 @@ public class ZjMaterielSynchronizationEventEntity extends BaseEntity {
     private String field0048code;//计量单位
     private String accName;//
     private String caccId;//
-
+    private String field0049;//认证信息
+    private String field0049code;//认证信息
 
     public String getFormmain_id() {
         return formmain_id;
@@ -518,5 +519,21 @@ public class ZjMaterielSynchronizationEventEntity extends BaseEntity {
     public void setCaccId(String caccId) {
         this.caccId = caccId;
     }
+
+    public String getField0049() {
+        return field0049;
+    }
+
+    public void setField0049(String field0049) {
+        this.field0049 = field0049;
+    }
+
+    public String getField0049code() {
+        return field0049code;
+    }
+
+    public void setField0049code(String field0049code) {
+        this.field0049code = field0049code;
+    }
 }
 
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml
index c857b339..cc1824b3 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zjmaterielsynchronizationevent/entity/ZjMaterielSynchronizationEventEntity.xml
@@ -70,6 +70,7 @@
              '6435913155541223805', -- field0042
              '7788441092115810835', -- field0047
              '-7568576445236623045' -- field0048
+             '-6211401909916515167' -- field0049
             )
     </select>
     <select id="getuser" resultType="com.hzya.frame.plugin.zjmaterielsynchronizationevent.entity.ZjMaterielSynchronizationEventEntity"
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 0fe5a7b6..cf651222 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
@@ -238,6 +238,10 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                     zjMaterielSynchronizationEventEntity.setField0035(object.getString("field0035"));//是否带入档案
                     zjMaterielSynchronizationEventEntity.setField0035code(mj.get(object.getString("field0035")));//是否带入档案 todo
                 }
+                if(object.getString("field0049") != null ){
+                    zjMaterielSynchronizationEventEntity.setField0049(object.getString("field0049"));//
+                    zjMaterielSynchronizationEventEntity.setField0049code(mj.get(object.getString("field0049")));// todo
+                }
 
                 zjMaterielSynchronizationEventEntity.setField0039(object.getString("field0039"));//开发号
                 if(object.getString("field0040") != null ){
@@ -302,7 +306,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
         if(list != null && list.size() > 0){
             for (int i = 0; i < list.size(); i++) {
                 ZjMaterielSynchronizationEventEntity entity = list.get(i);
-                if("新增".equals(entity.getField0018code()) || "增加替代".equals(entity.getField0018code()) || "升级".equals(entity.getField0018code())){
+                if("新增".equals(entity.getField0018code())){
                     entity.setDataSourceCode(zjoa);
                     zjMaterielSynchronizationEventDao.updatewlbm(entity);
                 }
@@ -333,7 +337,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
             }
             StringBuffer wlcode = new StringBuffer();
             //设置编码
-            if("新增".equals(entity.getField0018code()) || "增加替代".equals(entity.getField0018code()) || "升级".equals(entity.getField0018code())){
+            if("新增".equals(entity.getField0018code()) ){
                 if(entity.getField0043code().equals("12400")
                         || entity.getField0043code().equals("12500")
                         || entity.getField0043code().equals("12418")
@@ -429,7 +433,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                     wlcode.append(formattedNum);
                     wlcode.append("1");
                 }
-            }else if("修改".equals(entity.getField0018code())){
+            }else if("修改".equals(entity.getField0018code()) || "增加替代".equals(entity.getField0018code()) || "升级".equals(entity.getField0018code())){
                 wlcode.append(entity.getField0005());
             }
             //设置其他字段
@@ -499,6 +503,7 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                 inventoryEntity.setbProxyForeign("0");//  是否委外
                 inventoryEntity.setbPurchase("0");//  计划属性
             }
+            inventoryExtEntity.setCidefine7(entity.getField0049code());// 认证信息
             inventoryExtEntity.setCidefine6(entity.getField0034code());// 客户名
             inventoryExtEntity.setCidefine1(entity.getField0032code());//负责人
             inventoryExtEntity.setCidefine2(entity.getField0039());// 开发号/项目
@@ -691,6 +696,15 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
                         return BaseResult.getFailureMessageEntity(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 ){
+                        return BaseResult.getFailureMessageEntity(entity.getField0005()+"在U8中已存在,请检查货品编号");
+                    }
                 }else {//新增/增加替代/升级
                     xzCount++;
                     if(entity.getField0043code().startsWith("a")