From e678fbef6375e0bd83e96e897dea08b164558911 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 12 Mar 2024 14:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=B1=A0=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml | 7 +------
 1 file changed, 1 insertion(+), 6 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 1a584c05e..bf1639cc0 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')
+        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>
@@ -105,11 +105,6 @@
             and ldsa.freeze_status = #{distributionStockArticleVO.freezeStatus}
         </if>
         <!-- 条件没有写完 -->
-
-        <if test="distributionStockArticleVO.orderCode != null and distributionStockArticleVO.orderCode != ''">
-            and ldsa.order_code like concat('%',#{distributionStockArticleVO.orderCode},'%')
-        </if>
-
         <if test="distributionStockArticleVO.descriptionGoods != null and distributionStockArticleVO.descriptionGoods != ''">
             and ldsa.description_goods like concat('%',#{distributionStockArticleVO.descriptionGoods},'%')
         </if>