Merge remote-tracking branch 'origin/master'

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>
@@ -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>
@@ -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=",">

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);