From 2b1556c6805769a36e77d57e0a0078f92edbc01b Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 16 May 2024 23:51:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96sql=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8D=E8=A7=84=E8=8C=83=E5=86=99=E6=B3=95=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=B8=8D=E8=B5=B0=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleMapper.xml             | 8 ++++----
 .../mapper/DistributionStockArticleStatisticsMapper.xml   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index cb89d8718..be1ad87da 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -79,7 +79,7 @@
 
     <select id="selectClientListPage" resultMap="distributionStockArticleResultMap">
         SELECT * from logpm_distribution_stock_article ldsa where
-        ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = 1  and ldsa.reservation_status in ('10','20') and ldsa.order_status in ('10','20','30','70')
+        ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = '1'  and ldsa.reservation_status in ('10','20') and ldsa.order_status in ('10','20','30','70')
         <if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
             and ldsa.order_code  like concat(#{distributionStockArticleVO.orderCode},'%')
         </if>
@@ -431,7 +431,7 @@
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
         <where>
-            ldsa.is_deleted = 0 and ldsa.order_status in (10,20,30,40,50,60,70)
+            ldsa.is_deleted = 0 and ldsa.order_status in ('10','20','30','40','50','60','70')
             and ldsa.hand_quantity > 0
             <if test="param.orderCodeNumList != null">
                 and ldsa.order_code in
@@ -847,9 +847,9 @@
                  left join logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
                 left JOIN logpm_warehouse_tray lwt on lwtg.tray_id= lwt.id
         <where>
-            ldsa.is_deleted = 0 and ldsa.order_status IN ( 10, 20, 30, 40, 50, 60, 70 )
+            ldsa.is_deleted = 0 and ldsa.order_status IN ( '10', '20', '30', '40', '50', '60', '70' )
             and ldsa.hand_quantity > 0
-            and ldsa.genre = 1
+            and ldsa.genre = '1'
             <if test="param.warehouseId != null and param.warehouseId != ''">
                 and ldsa.warehouse_id = #{param.warehouseId}
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
index 3f071059a..9e4e94d4f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleStatisticsMapper.xml
@@ -12,7 +12,7 @@
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
         WHERE
           ldsa.is_deleted = 0
-          and ldsa.order_status in (10,20,30,40,50,60,70)
+          and ldsa.order_status in ('10','20','30','40','50','60','70')
           and ldsa.hand_quantity > 0
         <if test="param.orderCodeNumList != null">
             and ldsa.order_code in