From 1d0dda6dab65154cfc599d3f7442eabded143f0c Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 15 Mar 2024 15:38:56 +0800
Subject: [PATCH] =?UTF-8?q?SAP=E7=89=A9=E6=96=99=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E6=9C=AC=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/sap/service/impl/SapItemSyncImpl.java  | 2 +-
 .../src/main/resources/mapper/sap/SapBaseProductMapper.xml  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
index 94704d30d..bdf3f0d2e 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
@@ -212,9 +212,9 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 baseProduct.setGrossWeight(BRGEW);
                 baseProduct.setNetWeight(NTGEW);
                 baseProduct.setVolume(VOLUM);
+                baseProduct.setMeins(MEINS);
                 baseProduct.setDelFlag("0");
                 baseProduct.setActiveFlag("1");
-
                 baseProduct.setCreateBy(SecurityUtils.getUsername());
                 baseProduct.setCreateTime(DateUtils.dateTime("yyyy-MM-dd", ERSDA));
                 baseProduct.setUpdateTime(DateUtils.dateTime("yyyy-MM-dd", LAEDA));
diff --git a/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml b/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml
index d2dc7fa5a..d575d6989 100644
--- a/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml
+++ b/op-modules/op-sap/src/main/resources/mapper/sap/SapBaseProductMapper.xml
@@ -21,6 +21,7 @@
         <result property="netWeight" column="net_weight"/>
         <result property="tareWeight" column="tare_weight"/>
         <result property="volume" column="volume"/>
+        <result property="meins" column="meins"/>
         <result property="unitPrice" column="unit_price"/>
         <result property="productGroup" column="product_group"/>
         <result property="productGroupName" column="product_group_name"/>
@@ -50,7 +51,7 @@
     </resultMap>
 
     <sql id="selectBaseProductVo">
-		select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent from base_product
+		select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume,meins, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent from base_product
 	</sql>
 
     <select id="selectSBaseProductList" parameterType="com.op.system.api.domain.sap.SapBaseProduct"
@@ -129,6 +130,7 @@
             <if test="netWeight != null">net_weight,</if>
             <if test="tareWeight != null">tare_weight,</if>
             <if test="volume != null">volume,</if>
+            <if test="meins != null">meins,</if>
             <if test="unitPrice != null">unit_price,</if>
             <if test="productGroup != null">product_group,</if>
             <if test="productGroupName != null">product_group_name,</if>
@@ -173,6 +175,7 @@
             <if test="netWeight != null">#{netWeight},</if>
             <if test="tareWeight != null">#{tareWeight},</if>
             <if test="volume != null">#{volume},</if>
+            <if test="meins != null">meins,</if>
             <if test="unitPrice != null">#{unitPrice},</if>
             <if test="productGroup != null">#{productGroup},</if>
             <if test="productGroupName != null">#{productGroupName},</if>
@@ -220,6 +223,7 @@
             <if test="netWeight != null">net_weight = #{netWeight},</if>
             <if test="tareWeight != null">tare_weight = #{tareWeight},</if>
             <if test="volume != null">volume = #{volume},</if>
+            <if test="meins != null">meins = #{meins},</if>
             <if test="unitPrice != null">unit_price = #{unitPrice},</if>
             <if test="productGroup != null">product_group = #{productGroup},</if>
             <if test="productGroupName != null">product_group_name = #{productGroupName},</if>