1.单据实体类增加三期校验字段

api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java

@@ -299,6 +299,7 @@ public class WareHouseController {
         orderEntity1.setOutChangeEnable(addOrderRequest.isOutChangeEnable());
         orderEntity1.setPreCheck(addOrderRequest.isPreCheck());
         orderEntity1.setUpdateTime(new Date());
+        orderEntity1.setCodeFillCheck(addOrderRequest.isCodeFillCheck());
         orderService.updateOrder(orderEntity1);
         WarehouseEntity warehouseEntity = new WarehouseEntity();
         warehouseEntity.setOrderId(addOrderRequest.getOrderId());

api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java

@@ -71,4 +71,9 @@ public class OrderEntity {
     private String deptName;
 
     private String printRemark;
+
+    /**
+     * 采集UDI码时进行三期校验
+     */
+    private boolean codeFillCheck;
 }

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -34,7 +34,8 @@
                              receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, originFromType,invStorageCode,deptCode,printRemark)
+                             fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark,
+                             codeFillCheck)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,53 +55,55 @@
                 #{stockCheckFk},
                 #{thirdBillNo}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},#{invStorageCode},#{deptCode},#{printRemark})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{originFromType},
+                #{invStorageCode}, #{deptCode}, #{printRemark},
+                #{codeFillCheck})
     </insert>
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
         insert
-        ignore
+            ignore
-                INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
+        INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
-                              fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
+                      fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
-                              receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
+                      receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
-                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
+                      exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode,deptCode,printRemark)
+                      outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-        values (
+                      fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck)
-        #{id},
+        values (#{id},
-        #{action},
+                #{action},
-        #{corpOrderId},
+                #{corpOrderId},
-        #{actDate},
+                #{actDate},
-        #{fromCorpId},
+                #{fromCorpId},
-        #{actor},
+                #{actor},
-        #{mainAction},
+                #{mainAction},
-        #{fromCorp},
+                #{fromCorp},
-        #{status},
+                #{status},
-        #{remark},
+                #{remark},
-        #{exportStatus},
+                #{exportStatus},
-        #{fromType},
+                #{fromType},
-        #{contrastStatus},
+                #{contrastStatus},
-        #{signStatus},
+                #{signStatus},
-        #{receiveStatus},
+                #{receiveStatus},
-        #{erpFk},
+                #{erpFk},
-        #{stockCheckFk},
+                #{stockCheckFk},
-        #{thirdBillNo},
+                #{thirdBillNo},
-        #{supId},
+                #{supId},
-        #{exportFilePath},
+                #{exportFilePath},
-        #{locStorageCode},
+                #{locStorageCode},
-        #{supplementNo},
+                #{supplementNo},
-        #{ullageSupNo},
+                #{ullageSupNo},
-        #{createUser},
+                #{createUser},
-        #{reviewUser},
+                #{reviewUser},
-        #{outChangeEnable},
+                #{outChangeEnable},
-        #{originUllageSupNo},
+                #{originUllageSupNo},
-        #{preCheck},
+                #{preCheck},
-        #{updateTime},
+                #{updateTime},
-        #{replicateNo},
+                #{replicateNo},
-        #{invWarehouseCode},
+                #{invWarehouseCode},
-        #{fromSubInvCode},
+                #{fromSubInvCode},
-        #{createTime},
+                #{createTime},
-        #{originFromType},#{invStorageCode},#{deptCode}, #{printRemark}
+                #{originFromType}, #{invStorageCode}, #{deptCode}, #{printRemark},
-        )
+                #{codeFillCheck})
     </insert>
 
 
@@ -144,7 +147,7 @@
             <if test="originFromType != null and originFromType != ''">originFromType=#{originFromType},</if>
             <if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>
             <if test="printRemark != null and printRemark != ''">printRemark=#{printRemark},</if>
-
+            <if test="codeFillCheck != null">codeFillCheck=#{codeFillCheck},</if>
         </trim>
         WHERE id = #{id}
     </update>