From c27ecfce06c1dca99ad883df266de7a563772e1f Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 14 Jul 2022 10:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E8=BF=94=E5=9B=9E=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/admin/entity/inout/OrderEntity.java  |  5 +++++
 .../admin/entity/inout/StockOrderEntity.java  |  6 ++++++
 .../mybatis/mapper/inout/OrderDao.xml         | 21 ++++++++++---------
 .../mybatis/mapper/inout/StockOrderDao.xml    |  7 ++++---
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
index eb50e87..a41780d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
@@ -60,4 +60,9 @@ public class OrderEntity {
     private String createTime;
     private String fromSubInvCode;
 
+
+    private String billTypeName;
+    private String subInvName;
+    private String invName;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java
index d86d598..dc809f8 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java
@@ -45,4 +45,10 @@ public class StockOrderEntity {
     //委托验收已完成
     private boolean entrustEnd;
 
+
+
+    private String billTypeName;
+    private String subInvName;
+    private String invName;
+
 }
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 f51e9cb..ff8d2b6 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -191,7 +191,8 @@
     </update>
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT io_order.* FROM io_order
+        SELECT io_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bussiness_type.name billTypeName FROM io_order
+        left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
@@ -200,22 +201,22 @@
                 and io_order.id =#{id}
             </if>
             <if test="mainAction != '' and mainAction!=null">
-                and mainAction =#{mainAction}
+                and io_order.mainAction =#{mainAction}
             </if>
             <if test="fromCorpId != '' and fromCorpId!=null">
-                and fromCorpId =#{fromCorpId}
+                and io_order.fromCorpId =#{fromCorpId}
             </if>
             <if test="corpOrderId != '' and corpOrderId !=null">
-                and corpOrderId =#{corpOrderId}
+                and io_order.corpOrderId =#{corpOrderId}
             </if>
             <if test="action != '' and action!=null">
-                and action = #{action}
+                and io_order.action = #{action}
             </if>
             <if test="action==null or action == ''">
-                and `action`  <![CDATA[ <> ]]> 'StockCheck'
+                and io_order.`action`  <![CDATA[ <> ]]> 'StockCheck'
             </if>
             <if test="exportStatus != '' and exportStatus!=null">
-                and exportStatus = #{exportStatus}
+                and io_order.exportStatus = #{exportStatus}
             </if>
             <if test="status != '' and status!=null and status!=10">
                 and io_order.status = #{status}
@@ -245,13 +246,13 @@
                 <![CDATA[  and DATE_FORMAT(actDate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
             </if>
             <if test="customerId != '' and customerId!=null">
-                and customerId =#{customerId}
+                and io_order.customerId =#{customerId}
             </if>
             <if test="createUser!=null">
-                and createUser =#{createUser}
+                and io_order.createUser =#{createUser}
             </if>
             <if test="reviewUser!=null">
-                and reviewUser =#{reviewUser}
+                and io_order.reviewUser =#{reviewUser}
             </if>
             <if test="userId != '' and userId!=null">
                 and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
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 d2821ff..b6ea3ec 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -104,13 +104,14 @@
     </update>
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
-        SELECT stock_order.* FROM stock_order
+        SELECT stock_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bustype_local.name billTypeName FROM stock_order
+        left join basic_bustype_local on stock_order.billType = basic_bustype_local.action
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
-                and id =#{id}
+                and stock_order.id =#{id}
             </if>
             <if test="billNo != '' and billNo!=null">
                 and billNo LIKE concat('%',#{billNo},'%')
@@ -140,7 +141,7 @@
                 and statusInfo = #{statusInfo}
             </if>
             <if test="type != '' and type!=null">
-                and type = #{type}
+                and stock_order.type = #{type}
             </if>
             <if test="sourceType != '' and sourceType!=null">
                 and sourceType = #{sourceType}