From 75687ddfb5aace94b604e20e12bf7f65ca9eef55 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Tue, 26 Dec 2023 23:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E9=80=81=EF=BC=8C?=
 =?UTF-8?q?=E7=AD=BE=E8=AE=A2=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleMapper.java    |  7 +++++++
 .../mapper/DistributionStockArticleMapper.xml     | 15 +++++++++++++++
 .../impl/DistributionStockArticleServiceImpl.java |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
index c3a7f21b8..471273471 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
@@ -150,4 +150,11 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 * @return
 	 */
 	List<DistributionParcelListEntity> selectOrderPackageListByMap(@Param("param") Map<String, Object> packageDTO,@Param("warehouseId") Long id);
+
+	/**
+	 * 查询配送，签收数量
+	 * @param id
+	 * @return
+	 */
+	DistributionStockArticleEntity getStockArticleQueryQuantity(@Param("id")Long id);
 }
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 6bd5de7af..798c0917e 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
@@ -888,6 +888,21 @@
         where ldsa.is_zero = 1
         and ldsa.warehouse_id = #{warehouseId}
     </select>
+    <select id="getStockArticleQueryQuantity"  resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
+
+        select  sum((
+            select COUNT(ldl.id)
+            from logpm_distribution_loadscan ldl
+            where ldl.package_id = ldpl.id and ldl.signfor_state = 2
+        ) ) signinQuantity,
+            sum((
+                select COUNT(ldl.id)
+                from logpm_distribution_loadscan ldl
+                where ldl.package_id = ldpl.id and ldl.signfor_state = 1
+            ))  deliveryQuantity
+        from logpm_distribution_parcel_list  ldpl
+        where ldpl.stock_article_id = #{id}
+    </select>
     <select id="selectOrderPackageListByMap"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT
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 2f8d1568c..604f0ed7a 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
@@ -847,6 +847,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		IPage<DistributionStockArticleEntity> distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity);
 		distributionStockArticleEntityIPage.getRecords().stream().forEach(i ->{
+			DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.getStockArticleQueryQuantity(i.getId());
+			i.setDeliveryQuantity(distributionStockArticleEntity.getDeliveryQuantity());
+			i.setSigninQuantity(distributionStockArticleEntity.getSigninQuantity());
 			if(i.getIsZero().equals("1")){
 				//查询托盘
 				WarehouseTrayGoodsEntity warehouseTrayGoods = new WarehouseTrayGoodsEntity();