Merge branch 'fix_bug_20231225' into dev

# Conflicts:
#	blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java

@@ -151,6 +151,13 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 */
 	List<DistributionParcelListEntity> selectOrderPackageListByMap(@Param("param") Map<String, Object> packageDTO,@Param("warehouseId") Long id);
 
+	/**
+	 * 查询配送，签收数量
+	 * @param id
+	 * @return
+	 */
+	DistributionStockArticleEntity getStockArticleQueryQuantity(@Param("id")Long id);
+
 	/**
 	 * 增加订单的配送数量
 	 * @param stockArticleId

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -891,6 +891,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

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();