From 0fc5dcb63c8aedadd07ed13908ec351b2e01436a Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 29 Aug 2022 09:13:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=9C=9F=E6=A0=A1=E9=AA=8C=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/WareHouseController.java |  1 +
 .../sale/admin/entity/inout/OrderEntity.java  |  5 +
 .../mybatis/mapper/inout/OrderDao.xml         | 95 ++++++++++---------
 3 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
index 88e3793..aa273e6 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java
@@ -296,6 +296,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());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
index 7e647f7..3b8b2e8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
@@ -68,4 +68,9 @@ public class OrderEntity {
     private String deptName;
     private String printRemark;
 
+    /**
+     * 采集UDI码时进行三期校验
+     */
+    private boolean codeFillCheck;
+
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index a46f207..3cc7f26 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime, invStorageCode, deptCode, printRemark)
+                             fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -56,56 +56,57 @@
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
                 #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{invStorageCode},
                 #{deptCode},
-                #{printRemark})
+                #{printRemark},
+                #{codeFillCheck})
     </insert>
 
 
     <insert id="importOrder" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity">
         insert
-        ignore
-                INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
-                              fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
-                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
-                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,invStorageCode,deptCode,printRemark)
-        values (
-        #{id},
-        #{action},
-        #{corpOrderId},
-        #{actDate},
-        #{fromCorpId},
-        #{actor},
-        #{mainAction},
-        #{fromCorp},
-        #{status},
-        #{remark},
-        #{exportStatus},
-        #{fromType},
-        #{contrastStatus},
-        #{signStatus},
-        #{receiveStatus},
-        #{erpFk},
-        #{stockCheckFk},
-        #{customerId},
-        #{supId},
-        #{exportFilePath},
-        #{locStorageCode},
-        #{supplementNo},
-        #{ullageSupNo},
-        #{createUser},
-        #{reviewUser},
-        #{outChangeEnable},
-        #{originUllageSupNo},
-        #{preCheck},
-        #{updateTime},
-        #{replicateNo},
-        #{invWarehouseCode},
-        #{fromSubInvCode},
-        #{createTime},
-        #{invStorageCode},
-        #{deptCode},
-        #{printRemark}
-        )
+            ignore
+        INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
+                      fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
+                      receiveStatus, erpFk, stockCheckFk, customerId, supId,
+                      exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
+                      outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
+                      fromSubInvCode, createTime, invStorageCode, deptCode, printRemark, codeFillCheck)
+        values (#{id},
+                #{action},
+                #{corpOrderId},
+                #{actDate},
+                #{fromCorpId},
+                #{actor},
+                #{mainAction},
+                #{fromCorp},
+                #{status},
+                #{remark},
+                #{exportStatus},
+                #{fromType},
+                #{contrastStatus},
+                #{signStatus},
+                #{receiveStatus},
+                #{erpFk},
+                #{stockCheckFk},
+                #{customerId},
+                #{supId},
+                #{exportFilePath},
+                #{locStorageCode},
+                #{supplementNo},
+                #{ullageSupNo},
+                #{createUser},
+                #{reviewUser},
+                #{outChangeEnable},
+                #{originUllageSupNo},
+                #{preCheck},
+                #{updateTime},
+                #{replicateNo},
+                #{invWarehouseCode},
+                #{fromSubInvCode},
+                #{createTime},
+                #{invStorageCode},
+                #{deptCode},
+                #{printRemark},
+                #{codeFillCheck})
     </insert>
 
 
@@ -147,7 +148,7 @@
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</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>