diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index 52c43f23..45282cd9 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/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());
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
index 60388d25..c4f47d20 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
+++ b/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;
}
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 d9f51077..c41b7b06 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,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
- ignore
- INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
- fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
- receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
- exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
- outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,originFromType,invStorageCode,deptCode,printRemark)
- values (
- #{id},
- #{action},
- #{corpOrderId},
- #{actDate},
- #{fromCorpId},
- #{actor},
- #{mainAction},
- #{fromCorp},
- #{status},
- #{remark},
- #{exportStatus},
- #{fromType},
- #{contrastStatus},
- #{signStatus},
- #{receiveStatus},
- #{erpFk},
- #{stockCheckFk},
- #{thirdBillNo},
- #{supId},
- #{exportFilePath},
- #{locStorageCode},
- #{supplementNo},
- #{ullageSupNo},
- #{createUser},
- #{reviewUser},
- #{outChangeEnable},
- #{originUllageSupNo},
- #{preCheck},
- #{updateTime},
- #{replicateNo},
- #{invWarehouseCode},
- #{fromSubInvCode},
- #{createTime},
- #{originFromType},#{invStorageCode},#{deptCode}, #{printRemark}
- )
+ ignore
+ INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
+ fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
+ receiveStatus, erpFk, stockCheckFk, thirdBillNo, supId,
+ exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
+ outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
+ fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark, codeFillCheck)
+ values (#{id},
+ #{action},
+ #{corpOrderId},
+ #{actDate},
+ #{fromCorpId},
+ #{actor},
+ #{mainAction},
+ #{fromCorp},
+ #{status},
+ #{remark},
+ #{exportStatus},
+ #{fromType},
+ #{contrastStatus},
+ #{signStatus},
+ #{receiveStatus},
+ #{erpFk},
+ #{stockCheckFk},
+ #{thirdBillNo},
+ #{supId},
+ #{exportFilePath},
+ #{locStorageCode},
+ #{supplementNo},
+ #{ullageSupNo},
+ #{createUser},
+ #{reviewUser},
+ #{outChangeEnable},
+ #{originUllageSupNo},
+ #{preCheck},
+ #{updateTime},
+ #{replicateNo},
+ #{invWarehouseCode},
+ #{fromSubInvCode},
+ #{createTime},
+ #{originFromType}, #{invStorageCode}, #{deptCode}, #{printRemark},
+ #{codeFillCheck})
@@ -144,7 +147,7 @@
originFromType=#{originFromType},
deptCode=#{deptCode},
printRemark=#{printRemark},
-
+ codeFillCheck=#{codeFillCheck},
WHERE id = #{id}