From 47048f6468f3c19612bb4da2591facf88e56d082 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 26 Mar 2025 18:35:56 +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
---
.../ZjMaterielSynchronizationEventEntity.xml | 2 +-
.../ZjMaterielSynchronizationEventServiceImpl.java | 14 ++++++++++----
.../u8/base/inventory/entity/InventoryEntity.xml | 1 -
3 files changed, 11 insertions(+), 6 deletions(-)
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 bf365cda..7cea0600 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
@@ -39,7 +39,7 @@
</select>
- <update id="entity_update" parameterType="com.hzya.frame.plugin.zjmaterielsynchronizationevent.entity.ZjMaterielSynchronizationEventEntity">
+ <update id="updatewlbm" parameterType="com.hzya.frame.plugin.zjmaterielsynchronizationevent.entity.ZjMaterielSynchronizationEventEntity">
update formson_0275 set
<trim suffix="" suffixOverrides=",">
<if test="field0005 != null and field0005 !='' ">field0005 =#{field0005},</if>
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 6841b3fa..0d808515 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
@@ -286,8 +286,9 @@ public class ZjMaterielSynchronizationEventServiceImpl extends BaseService<ZjMat
//定制化字段
inventoryEntity.setDataSourceCode(zju8);
inventoryEntity.setAcc_name("UFDATA_999_2025.dbo.");
- inventoryEntity.setCacc_id("999");
+ inventoryEntity.setCacc_id("025");
+ logger.error("物料编码"+wlcode);
//inventoryEntity.setAcc_name("UFDATA_998_2014.dbo.");
//inventoryEntity.setCacc_id("998");
inventoryEntity.setcInvCode(wlcode.toString());//物料编码
@@ -298,12 +299,17 @@ 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());// todo 仓库名称(值需要转换)
+ inventoryEntity.setcDefWareHouse(entity.getField0040code());// 仓库名称(值需要转换)
//inventoryEntity.setcInvCCode(entity.getField0012code());// todo 优选等级
//inventoryEntity.setbSrvItem(entity.getField0039());// todo 开发号(值需要转换)
//inventoryEntity.setcInvCCode(entity.getField0042code());// todo 物料属性
- //inventoryEntity.setbProxyForeign(entity.getField0022code());// 是否委外
- //inventoryEntity.setcInvCCode(entity.getField0022code());// todo 计划属性字段不确定
+ if(entity.getField0022code() != null && "是".equals(entity.getField0022code())){
+ inventoryEntity.setbProxyForeign("1");// 是否委外
+ inventoryEntity.setbPurchase("1");// 计划属性
+ }else {
+ inventoryEntity.setbProxyForeign("0");// 是否委外
+ inventoryEntity.setbPurchase("0");// 计划属性
+ }
//inventoryEntity.setcInvCCode(entity.getField0033code());// todo 产品阶段
//inventoryEntity.setcInvCCode(entity.getField0032code());// todo 负责人
savedata.add(inventoryEntity);
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 889493a4..c8a58566 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
@@ -2503,7 +2503,6 @@
<if test="cCommodity != null and cCommodity !='' "> cCommodity = #{cCommodity},</if>
<if test="iRecipeBatch != null and iRecipeBatch !='' "> iRecipeBatch = #{iRecipeBatch},</if>
<if test="cNotPatentName != null and cNotPatentName !='' "> cNotPatentName = #{cNotPatentName},</if>
- <if test="pubufts != null and pubufts !='' "> pubufts = #{pubufts},</if>
<if test="bPromotSales != null and bPromotSales !='' "> bPromotSales = #{bPromotSales},</if>
<if test="iPlanPolicy != null and iPlanPolicy !='' "> iPlanPolicy = #{iPlanPolicy},</if>
<if test="iROPMethod != null and iROPMethod !='' "> iROPMethod = #{iROPMethod},</if>