diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
index 6036b190..241d38f9 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
@@ -640,11 +640,11 @@ public class OrderDetailController {
return ResultVOUtils.error(500, "所选单据类型不一致!");
}
- if (orderEntity.getInvStorageCode().equals(erpOrderEntities.get(i).getLocStorageCode())) {
+ if (!orderEntity.getInvStorageCode().equals(erpOrderEntities.get(i).getLocStorageCode())) {
return ResultVOUtils.error(500, "扫码单据与业务单据当前仓库不一致!");
}
- if (orderEntity.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
+ if (!orderEntity.getInvWarehouseCode().equals(erpOrderEntities.get(i).getInvWarehouseCode())) {
return ResultVOUtils.error(500, "扫码单据与业务单据当前分库不一致!");
}
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
index 80d3130a..e732f474 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
@@ -294,6 +294,7 @@
tyshxydm=#{tyshxydm},
zczbhhzbapzbh=#{zczbhhzbapzbh},
cpms=#{cpms},
+ sptm=#{sptm},
measname=#{measname},
allowNoBatch=#{allowNoBatch},
allowNoExpire=#{allowNoExpire},