From bf47235f34ea53e17c1b79be696c361ef0b4127c Mon Sep 17 00:00:00 2001
From: zhaoxl <zhaoxl@kehaida.com>
Date: Mon, 28 Aug 2023 10:56:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=87=B3=20'op-modules/op-quality/src/main/resources/mapper'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op-quality/src/main/resources/mapper/QcProCheckMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml
index 8b4e749f0..ae89b30d4 100644
--- a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml
@@ -75,13 +75,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="fileId != null">file_id,</if>
             <if test="isqua != null">isqua,</if>
+            <if test="fileId != null">file_id,</if>
 
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id},</if>
             <if test="rfid != null and rfid != ''">#{rfid},</if>
+            <if test="id != null and id != ''">#{id},</if>
             <if test="factoryId != null and factoryId != ''">#{factoryId},</if>
             <if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
             <if test="workorderId != null and workorderId != ''">#{workorderId},</if>

From 7158568d2d575c3f3181eadd8661a8959f68ba6a Mon Sep 17 00:00:00 2001
From: zhaoxl <zhaoxl@kehaida.com>
Date: Mon, 28 Aug 2023 10:58:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'op-modules/op-quality?=
 =?UTF-8?q?/src/main/resources/mapper/QcProCheckMapper.xml'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op-quality/src/main/resources/mapper/QcProCheckMapper.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml
index ae89b30d4..1b3553b81 100644
--- a/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/QcProCheckMapper.xml
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <insert id="insertQcProCheck" parameterType="QcProCheck" useGeneratedKeys="true" keyProperty="id">
+        <insert id="insertQcProCheck" parameterType="QcProCheck" useGeneratedKeys="true" keyProperty="id">
         insert into qc_pro_check
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="rfid != null and rfid != ''">rfid,</if>
@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
 
+
     <update id="updateQcProCheckById" parameterType="QcProCheck">
         update qc_pro_check
         <trim prefix="SET" suffixOverrides=",">

From 5a8c6ffeaeb8f8b42a3030248dbd6a6bce79923c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 28 Aug 2023 11:29:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=8B=E5=8F=91sap?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
index 79f9bee99..e254f15df 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
@@ -82,6 +82,7 @@ public class SapOrderServiceImpl implements SapOrderService {
                 proOrder.setUpdateBy(ERNAM);
                 proOrder.setUpdateTime(DateUtils.dateTime("yyyy-MM-dd", ERDAT));
                 proOrder.setStatus("o0");
+                proOrder.setProdType("prod");
                 proOrderList.add(proOrder);
                 // remotePlanService.sapAddOrder(proOrder);
                 // remoteMesService.sapAddOrder(proOrder);