From cedb87b6208c9ba15ecd46cd187c5b5b567ddd24 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 24 Aug 2022 16:09:51 +0800
Subject: [PATCH] =?UTF-8?q?UDI=E5=90=8C=E6=AD=A5=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2i=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/WareHouseController.java      |  1 -
 .../resources/mybatis/mapper/inout/OrderDao.xml    | 14 ++++++++------
 .../mybatis/mapper/inout/StockOrderDao.xml         |  5 +++--
 3 files changed, 11 insertions(+), 9 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 2333076..9d0f7fa 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
@@ -482,7 +482,6 @@ public class WareHouseController {
 
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
         if (udiEntity == null) {
-
             String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
             if (sptmtodi.equals("1")) {
                 if (code.length() == 13) {
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 1c5dc59..a46f207 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -610,20 +610,22 @@
     </select>
 
     <select id="selectByBillNo" resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        select *
+        select io_order.*, auth_dept.name deptName
         from io_order
-        where status = 4
-          and (id = #{billNo} or erpFk = #{billNo})
+                 left join auth_dept on io_order.deptCode = auth_dept.code
+        where io_order.status = 4
+          and (io_order.id = #{billNo} or io_order.erpFk = #{billNo})
     </select>
 
     <select id="selectByIds" resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        select *
+        select io_order.*,auth_dept.name deptName
         from io_order
-        where id in
+        left join auth_dept on io_order.deptCode =auth_dept.code
+        where io_order.id in
         <foreach collection="orderIds" separator="," index="index" item="item" open="(" close=")">
             #{item}
         </foreach>
-        order by id desc
+        order by io_order.id desc
     </select>
 
     <update id="updateOrderTime">
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
index ba7c459..3d7d8cd 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -246,10 +246,11 @@
 
     <select id="findOne" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
-        SELECT * FROM stock_order
+        select stock_order.*, auth_dept.name deptName FROM stock_order
+        left join auth_dept on stock_order.dept = auth_dept.code
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and stock_order.id =#{id}
             </if>
             <if test="corpId != '' and corpId !=null">
                 and corpId =#{corpId}