From f0c032a51962e3d0e7ab5dae81826233db62749e Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Mar 2024 10:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=93=E8=AE=A2=E5=8D=95=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=90=9C=E7=B4=A2=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml     | 3 +++
 .../service/impl/DistributionStockArticleServiceImpl.java      | 3 +++
 2 files changed, 6 insertions(+)

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 e2c1bc3cf..fb141d441 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
@@ -454,6 +454,9 @@
             <if test=" param.waybillNumLike != '' and param.waybillNumLike != null  ">and ldsa.waybill_number like
                 concat('%',#{param.waybillNumLike},'%')
             </if>
+            <if test=" param.typeService != '' and param.typeService != null  ">
+                and ldsa.type_service = #{param.typeService}
+            </if>
             <if test=" param.warehouseIdList != null  ">and ldsa.warehouse_id in
                 <foreach collection="param.warehouseIdList" open="(" item="a" close=")" separator=",">
                     #{a}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index a2dd65cbe..63c19f754 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -840,6 +840,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	public IPage<DistributionStockArticleEntity> pageListOwe(IPage<Object> page, Map<String, Object> distributionStockArticle) {
 		DistributionStockArticleOweDTO stockArticleEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockArticle), DistributionStockArticleOweDTO.class);
+		if (Func.isNotEmpty(distributionStockArticle.get("typeServer"))){
+			stockArticleEntity.setTypeService((String) distributionStockArticle.get("typeServer"));
+		}
 		if (Func.isNotEmpty(stockArticleEntity.getOrderCodeNum())) {
 			String anumbering = stockArticleEntity.getOrderCodeNum().trim();
 			List<String> list = CommonUtil.stringNum(anumbering);