From 2e36abdc602c7d4d048ba42ff850b79f07888bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 27 Apr 2023 11:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/controller/purchase/IoPurChangeService.java  | 4 ++--
 .../java/com/glxp/api/res/basic/UdiRelevanceResponse.java     | 1 +
 src/main/java/com/glxp/api/res/inout/IoOrderResponse.java     | 3 +++
 src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
index 7317cd49c..2b3157389 100644
--- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
+++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
@@ -385,8 +385,8 @@ public class IoPurChangeService {
                 ioOrderEntity.setUpdateTime(new Date());
                 ioOrderEntity.setUpdateUser(purPlanEntity.getCreateUser());
                 ioOrderEntity.setCustomerId("110");
-                ioOrderEntity.setDeptCode(purPlanEntity.getInvCode());
-                ioOrderEntity.setInvCode(purPlanEntity.getDeptCode());
+                ioOrderEntity.setDeptCode(purPlanEntity.getDeptCode());
+                ioOrderEntity.setInvCode(purPlanEntity.getInvCode());
                 ioOrderService.insertOrder(ioOrderEntity);
                 billNo += ioOrderEntity.getBillNo() + ",";
                 //插入业务单表
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index e75499eae..d2f06e5dd 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -70,6 +70,7 @@ public class UdiRelevanceResponse {
     private Boolean allowNoBatch;
     private Boolean allowNoExpire;
     private Boolean allowNoProduct;
+    private Boolean allowNoSerial;
     private String spmc;
     private String cplx;
     private String hchzsb;
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
index c047b9e76..514dbe2ea 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@@ -220,6 +220,9 @@ public class IoOrderResponse {
     private Integer processStatus;
     private int inCodeStatus;
 
+    private Date checkTime;
+    private String checkUserName;
+
 
     /**
      * 校验信息
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
index dd44c14f5..a231f6342 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
@@ -36,7 +36,7 @@
                 AND thirdSysFk = #{thirdSysFk}
             </if>
             <if test="thirdSys != '' and thirdSys != null">
-                AND thirdSys = #{thirdSys}
+                AND thirdSysFk = #{thirdSys}
             </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%',#{supName},'%')