From 2a08b60f3b106205fd98815c306e85cc0cd0779a Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Thu, 27 Oct 2022 16:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=B9=E6=AF=94bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/controller/inout/OrderDetailController.java     | 4 ++--
 .../src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

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 @@
             <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
             <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
             <if test="cpms != null">cpms=#{cpms},</if>
+            <if test="sptm != null">sptm=#{sptm},</if>
             <if test="measname != null">measname=#{measname},</if>
             <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
             <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>