From 037498849f373f42a07349d0ab22d8f3dbc3d5e5 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sun, 7 Apr 2024 14:32:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?LJ04=E7=9A=84=E8=AE=A2=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/plan/service/impl/ProOrderServiceImpl.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index 53720057..8baa1353 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -303,7 +303,7 @@ public class ProOrderServiceImpl implements IProOrderService {
                     workOrder.setProductName(productNameInfo.getProdDesc());
 
                     workOrder.setBelongWorkOrder(belongWorkOrder);
-                    workOrder.setProdType("LJ01");
+                    workOrder.setProdType(proOrder.getOrderType());
 
                     // 将工单信息更新至数据库/**pro_order_workorder**/
                     proOrderWorkorderMapper.insertProOrderWorkorder(workOrder);
@@ -574,7 +574,6 @@ public class ProOrderServiceImpl implements IProOrderService {
             order.setPlanFactoryCode(factoryCode);
             order.setFactoryCode(factoryCode);
             order.setCreateBy(SecurityUtils.getUsername());
-            order.setOrderType("LJ01");
             order.setProdType("prod");
             order.setStatus("o0");
             bpqo = new BaseProduct();

From 4a3367df37bc5677c20327724ce7c421efc4639f Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Sun, 7 Apr 2024 15:33:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?2024-04-07=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97-=E4=BA=A7=E5=93=81-=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=B1=87=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/wms/BaseProductMapper.xml  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
index 204cd45e..83230d23 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
@@ -64,10 +64,11 @@
         <result property="pvc" column="pvc"/>
         <result property="supportPlate" column="support_plate"/>
         <result property="other" column="other"/>
+        <result property="reportRate" column="report_rate"/>
     </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,mtart 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, 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, mtart, report_rate from base_product
 	</sql>
 
     <select id="selectBaseProductList" parameterType="BaseProduct" resultMap="BaseProductResult">
@@ -110,6 +111,7 @@
             <if test="appendFlag != null  and appendFlag != ''">and append_flag = #{appendFlag}</if>
             <if test="appendPercent != null  and appendPercent != ''">and append_percent = #{appendPercent}</if>
             <if test="mtart != null  and mtart != ''">and mtart = #{mtart}</if>
+            <if test="reportRate != null  and reportRate != ''">and report_rate = #{reportRate}</if>
             and del_flag = '0'
         </where>
         order by product_code asc
@@ -160,6 +162,7 @@
 		bp.append_flag,
 		bp.append_percent,
 		bp.mtart,
+		bp.report_rate,
 		bpa.category,
 		bpa.pc,
 		bpa.iei,
@@ -229,6 +232,7 @@
             <if test="appendFlag != null">append_flag,</if>
             <if test="appendPercent != null">append_percent,</if>
             <if test="mtart != null">mtart,</if>
+            <if test="reportRate != null">report_rate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productId != null">#{productId},</if>
@@ -274,6 +278,7 @@
             <if test="appendFlag != null">#{appendFlag},</if>
             <if test="appendPercent != null">#{appendPercent},</if>
             <if test="mtart != null">#{mtart},</if>
+            <if test="reportRate != null">#{reportRate},</if>
         </trim>
     </insert>
 
@@ -321,6 +326,7 @@
             <if test="appendFlag != null">append_flag = #{appendFlag},</if>
             <if test="appendPercent != null">append_percent = #{appendPercent},</if>
             <if test="mtart != null and mtart != ''">mtart = #{mtart},</if>
+            <if test="reportRate != null and reportRate != ''">report_rate = #{reportRate},</if>
         </trim>
         where product_id = #{productId}
     </update>
@@ -398,6 +404,7 @@
 		bp.append_flag,
 		bp.append_percent,
 		bp.mtart,
+		bp.report_rate,
 		bpa.category,
 		bpa.pc,
 		bpa.iei,

From 835d1da2acc84c6f9b721233d10d339cb3f5aa3c Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Sun, 7 Apr 2024 15:35:32 +0800
Subject: [PATCH 3/4] =?UTF-8?q?2024-04-07=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E4=BA=A7=E5=93=81-=E6=8A=A5=E5=B7=A5=E6=B1=87?=
 =?UTF-8?q?=E7=8E=872?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/wms/domain/BaseProduct.java   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java
index 94faff0d..2f4b896e 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java
@@ -344,6 +344,12 @@ public class BaseProduct extends BaseEntity {
     @Excel(name = "其它")
     private String other;
 
+    /**
+     * 报工汇率
+     */
+    @Excel(name = "报工汇率")
+    private Integer reportRate;
+
     public void setCategory(String category) {
         this.category = category;
     }
@@ -784,6 +790,14 @@ public class BaseProduct extends BaseEntity {
         return mtart;
     }
 
+    public void setReportRate(Integer reportRate) {
+        this.reportRate = reportRate;
+    }
+
+    public Integer getReportRate() {
+        return reportRate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

From a7ad51eddac3752b7719a778eccdb3d2255194d7 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sun, 7 Apr 2024 16:32:13 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9D=A5=E6=96=99bc=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java   | 1 +
 1 file changed, 1 insertion(+)

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 e630f7ef..c1ccc02b 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
@@ -412,6 +412,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 qcCheckTaskIncomeDTO.setRecordId(IdUtils.fastSimpleUUID());
                 qcCheckTaskIncomeDTO.setCheckType("checkTypeLL");
                 qcCheckTaskIncomeDTO.setTypeCode("material");
+                qcCheckTaskIncomeDTO.setOrderType("bc");//包材
                 qcCheckTaskIncomeDTO.setOrderNo(maraTable.getString("EBELN"));//采购订单
                 qcCheckTaskIncomeDTO.setSupplierCode(maraTable.getString("LIFNR"));
                 qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM"));