From ec02cb14c2cdddd486f59d9d3a4559ca80108c27 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sun, 28 Apr 2024 17:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E8=A3=85=E8=BD=A6=E5=AD=98=E5=9C=A8=E8=A3=85=E8=BD=A6?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 9c17e3975..0a0fbddb9 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
@@ -6652,6 +6652,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					List<Map<String, Object>> mapList = distributionReservationMapper.getCategoryByStockArticleIdAndReservationId(stockArticleId, reservationId);
 					Map<String, Object> numObj = new HashMap<>();
 					Integer tn = 0;
+					Integer sn = 0;
 					Set<String> set = totalDetail.keySet();
 					for (String key : set) {
 						if (!"合计数量".equals(key)) {
@@ -6661,6 +6662,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								Long num = (Long) m.get("num");
 								Long signNum = (Long) m.get("aaa");
 								if (thirdProduct.equals(key)) {
+									sn +=  num.intValue();
 									numObj.put(key, num);
 									tn = tn + num.intValue();
 								}
@@ -6670,11 +6672,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 					}
 					orderMap.put("合计数量", tn);
+					orderMap.put("小计", sn);
 					orderMap.put("产品明细", numObj);
 					orderMap.put("产品明细长度", numObj.size());
-
-
-
+					Map<String, Object> info = (Map<String, Object>) total.get("产品明细");
 					//通过订单id和预约id查询对应包件的物料信息
 					List<String> materialNameStrList = distributionReservationMapper.getMaterialNameByStockArticleIdAndReservationId(stockArticleId, reservationId);
 					String materialNameStr = StringUtils.join(materialNameStrList, ",");
@@ -7213,6 +7214,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			log.info(method + "存在装车数据:{}", reservationCodes);
 			return R.fail(deliveryListEntity.getTrainNumber() + "存在装车包件!!!");
 		}
+		DistributionLoadingNumDTO deliveryLoadingNum = distributionDeliveryListMapper.selectDeliveryLoadingNum(deliveryId);
+		if (deliveryLoadingNum.getPackageLoadingQuantity()+deliveryLoadingNum.getInventoryLoadingQuantity() > 0){
+			log.info(method + "存在装车数据 装车件数>>>>>>>>>>:{}", (deliveryLoadingNum.getPackageLoadingQuantity()+deliveryLoadingNum.getInventoryLoadingQuantity()));
+			return R.fail(deliveryListEntity.getTrainNumber() + "存在装车包件!!!");
+		}
+
 		List<Long> ids = reservationEntities.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList());
 
 		List<DistributionLoadscanEntity> packageList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()