修改订单查询配送，签收数量

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

@@ -422,7 +422,16 @@
         ldsa.train_number, ldsa.factory_train, ldsa.sending, ldsa.send_warehouse_id, ldsa.send_warehouse_name,
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status,
         GROUP_CONCAT( DISTINCT lwtg.tray_code ) trays,
-        GROUP_CONCAT( DISTINCT lwug.position_code ) allocation
+        GROUP_CONCAT( DISTINCT lwug.position_code ) allocation,
+        (select COUNT(ldp.id)
+        from logpm_distribution_parcel_list ldp
+        where ldp.stock_article_id = ldsa.id and ldp.order_package_status = 70
+        ) 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_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -50,6 +50,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
@@ -847,9 +848,13 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		IPage<DistributionStockArticleEntity> distributionStockArticleEntityIPage = baseMapper.pageListOwe(page, stockArticleEntity);
 		distributionStockArticleEntityIPage.getRecords().stream().forEach(i ->{
-			DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.getStockArticleQueryQuantity(i.getId());
+/*			DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.getStockArticleQueryQuantity(i.getId());
 			i.setDeliveryQuantity(distributionStockArticleEntity.getDeliveryQuantity());
-			i.setSigninQuantity(distributionStockArticleEntity.getSigninQuantity());
+			List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+				.eq(DistributionParcelListEntity::getStockArticleId, i.getId())
+				.eq(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue())
+			);
+			i.setSigninQuantity(distributionStockArticleEntity.getSigninQuantity() + list.size() );*/
 			if(i.getIsZero().equals("1")){
 				//查询托盘
 				WarehouseTrayGoodsEntity warehouseTrayGoods = new WarehouseTrayGoodsEntity();