From a41125c0e6347f04ed043b32e7afcae8921a1ca4 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 19 Apr 2024 16:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E6=89=93=E5=8D=B0=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=A8=A1=E6=9D=BF=E7=AD=BE=E6=94=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionReservationMapper.xml    | 3 +++
 .../service/impl/DistributionDeliveryListServiceImpl.java    | 5 +++++
 .../service/impl/DistributionSignforServiceImpl.java         | 3 +--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index 72c2c5308..8ff1dc188 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -1221,9 +1221,12 @@
 
     <select id="getCategoryByStockArticleIdAndReservationId" resultType="java.util.Map">
         select IFNULL(ldpl.third_product,'其他') thirdProduct,
+        IFNULL(count( ldl.id )  ,0) AS aaa,
                 count(ldpl.id) num
         from logpm_distribution_reservation_package ldrp
          left join logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id and ldpl.is_deleted = 0
+        LEFT JOIN logpm_distribution_loadscan AS ldl ON ldpl.id = ldl.package_id AND ldrp.reservation_id = ldl.reservation_id AND ldl.is_deleted = 0 AND ldl.scan_status != 1
+
         where 1=1
           and ldrp.reservation_id = #{reservationId}
           and ldrp.stock_article_id = #{stockArticleId}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 7a8674c72..431f564ed 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -6577,17 +6577,22 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							for (Map<String, Object> m : mapList) {
 								String thirdProduct = (String) m.get("thirdProduct");
 								Long num = (Long) m.get("num");
+								Long signNum = (Long) m.get("aaa");
 								if (thirdProduct.equals(key)) {
 									numObj.put(key, num);
 									tn = tn + num.intValue();
 								}
+								orderMap.put("签收件数", signNum);
 							}
 						}
+
 					}
 					orderMap.put("合计数量", tn);
 					orderMap.put("产品明细", numObj);
 					orderMap.put("产品明细长度", numObj.size());
 
+
+
 					//通过订单id和预约id查询对应包件的物料信息
 					List<String> materialNameStrList = distributionReservationMapper.getMaterialNameByStockArticleIdAndReservationId(stockArticleId, reservationId);
 					String materialNameStr = StringUtils.join(materialNameStrList, ",");
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index a077841f0..d515c36cd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -2842,7 +2842,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			//查询装车扫描表
 			List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
-				.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
+//				.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
 //				.eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
 				.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
 				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
@@ -2853,7 +2853,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					log.error("##############异常签收包件在其他车次进行装车reservationId:{}", loadscanEntityList.stream().map(DistributionLoadscanEntity::getReservationId).map(String::valueOf).collect(Collectors.joining(",")));
 					return Resp.scanFail("操作失败", "包件已出库");
 				}
-
 				if (loadscanEntityList.size() == 1){
 					 loadscanEntity = loadscanEntityList.get(0);
 				}