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

---
 .../mybatis/mapper/business/StockOrderDao.xml  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
index a7d89088..f79c6901 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
@@ -105,13 +105,14 @@
 
     <select id="filterListOr" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
             resultType="com.glxp.api.admin.entity.business.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},'%')
@@ -141,7 +142,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}
@@ -149,18 +150,15 @@
             <if test="printStatus != '' and printStatus!=null">
                 and printStatus = #{printStatus}
             </if>
-            <if test="localAction != '' and localAction!=null">
-                and billType = #{localAction}
-            </if>
             <if test="unitIdFk != '' and unitIdFk!=null">
                 and unitIdFk = #{unitIdFk}
             </if>
-
-
+            <if test="localAction != '' and localAction!=null">
+                and billType = #{localAction}
+            </if>
             <if test="userId!=null">
                 and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
-                invWarehouseCode is null or
-                invWarehouseCode ='')
+                invWarehouseCode is null or invWarehouseCode='')
             </if>
 
             <if test="customerId != '' and customerId!=null">