From 0b2de788c4b17fab90d062fdfc509139b581dfba Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Dec 2023 19:08:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleMapper.xml | 50 ++++++++++++++++++-
 .../mapper/DistributionStockListMapper.xml    |  6 ++-
 .../DistributionStockListServiceImpl.java     |  2 +
 3 files changed, 56 insertions(+), 2 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 c5ca065a3..9cf6cd566 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
@@ -101,10 +101,54 @@
         <if test="distributionStockArticleVO.freezeStatus != null and distributionStockArticleVO.freezeStatus != ''">
             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>
+
+        <if test="distributionStockArticleVO.warehouse != null and distributionStockArticleVO.warehouse != ''">
+            and ldsa.warehouse like concat('%',#{distributionStockArticleVO.warehouse},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.brand != null and distributionStockArticleVO.brand != ''">
+            and ldsa.brand like concat('%',#{distributionStockArticleVO.brand},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.storeName != null and distributionStockArticleVO.storeName != ''">
+            and ldsa.store_name like concat('%',#{distributionStockArticleVO.storeName},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.customerName != null and distributionStockArticleVO.customerName != ''">
+            and ldsa.customer_name like concat('%',#{distributionStockArticleVO.customerName},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.customerTelephone != null and distributionStockArticleVO.customerTelephone != ''">
+            and ldsa.customer_telephone like concat('%',#{distributionStockArticleVO.customerTelephone},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.customerAddress != null and distributionStockArticleVO.customerAddress != ''">
+            and ldsa.customer_address like concat('%',#{distributionStockArticleVO.customerAddress},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.waybillNumber != null and distributionStockArticleVO.waybillNumber != ''">
+            and ldsa.waybill_number like concat('%',#{distributionStockArticleVO.waybillNumber},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.totalNumber != null and distributionStockArticleVO.totalNumber != ''">
+            and ldsa.total_number = #{distributionStockArticleVO.totalNumber}
+        </if>
+
+        <if test="distributionStockArticleVO.handQuantity != null and distributionStockArticleVO.handQuantity != ''">
+            and ldsa.hand_quantity = #{distributionStockArticleVO.handQuantity}
+        </if>
     </select>
+
+
     <select id="getAllReservationStockArticleInfo"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
         SELECT
@@ -590,6 +634,10 @@
             <if test="par.customerTelephone != null and par.customerTelephone != '' ">
                 and ldsa.customer_telephone like concat('%',#{par.customerTelephone},'%')
             </if>
+
+            <if test="par.serviceNumber != null and par.serviceNumber != '' ">
+                and ldsa.service_number like concat('%',#{par.serviceNumber},'%')
+            </if>
             <if test="par.consigneeAddress != null and par.consigneeAddress != '' ">
                 and ldsa.consignee_address like concat('%',#{par.consigneeAddress},'%')
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index c0c7fda2e..919b5c5a6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -35,7 +35,7 @@
     </resultMap>
 
     <sql id="stockList">
-        select DISTINCT ldsi.service_number serviceNumber,ldsi.service_type serviceType,ldsi.description_goods descriptionGoods,ldsi.cargo_number cargoNumber,ldsi.despatch ,ldsi.incoming_batch incomingBatch,ldsi.warehouse_id warehouseId,
+        select DISTINCT ldsi.service_number serviceNumber,ldsi.service_type serviceType,ldsi.description_goods descriptionGoods,ldsi.cargo_number cargoNumber,ldsi.despatch ,ldsi.incoming_batch incomingBatch,ldsi.warehouse_id warehouseId,ldsi.order_code orderCode,
         CASE  WHEN ldsi.pid is null THEN
         (select  sum(l.quantity_stock)
         from logpm_distribution_stock_list l
@@ -176,6 +176,10 @@
             <if test=" param.despatch != null and param.despatch != ''">and ldsi.despatch like concat('%',
                 #{param.despatch},'%')
             </if>
+
+            <if test=" param.orderCode != null and param.orderCode != ''">and ldsi.order_code like concat('%',
+                #{param.orderCode},'%')
+            </if>
             <if test=" param.incomingBatch != null and param.incomingBatch != ''">and ldsi.incoming_batch like
                 concat('%', #{param.incomingBatch},'%')
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index fdd0fa170..f5b6533c8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -371,6 +371,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		List clientIds =null;
 		if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){
 			 clientIds = basicdataClientUserEntityListByUserIds.stream().map(BasicdataClientUserEntity::getClientId).collect(Collectors.toList());
+		}else {
+			return null;
 		}
 		IPage<DistributionStockListVO> page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds);
 		return  page1;

From b8df0b5393457c6b9ad1faf7cbc4fa345c981336 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Dec 2023 20:22:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=9C=BA=E7=AB=AF=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9cf6cd566..182837537 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
@@ -76,7 +76,7 @@
         SELECT client_id from logpm_basicdata_clientuser where user_id =#{loginUserId}
         )
         and
-        ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = 1
+        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')
         <if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
             and ldsa.order_code = #{distributionStockArticleVO.orderCode}
         </if>