From b9decffd7bfd9e13b61f2a3677f1e71daf820e42 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 1 Apr 2024 23:21:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E5=BA=93?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8C=89=E7=85=A7=E5=85=A5=E5=BA=93=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=9D=A5=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockArticleMapper.xml |  2 +-
 .../impl/DistributionAsyncServiceImpl.java    |  2 --
 .../DistributionDeliveryListServiceImpl.java  | 33 +------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

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 3c9be512d..d5400e775 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
@@ -544,7 +544,7 @@
                 concat('%',#{param.allocation},'%')
             </if>
         </where>
-        group by ldsa.id
+        group by ldsa.warehouse_entry_time desc
     </select>
     <select id="selectOneByWrap" resultType="com.logpm.distribution.vo.app.queryOrderVO">
         SELECT ldsa.* FROM logpm_distribution_parcel_list ldpl join logpm_distribution_stock_article ldsa on
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index 41e50ac87..e442291f5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1607,8 +1607,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 
 						for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
-							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>distributionParcelListEntities: {}", distributionParcelListEntities);
-							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>distributionParcelListEntity: {}", distributionParcelListEntity);
 							// todo 查询签收信息
 							DistributionSignforEntity distributionSignfor = distributionSignforService.getByReservationId(distributionReservationStockarticleEntity.getReservationId());
 							OrderStatusDTO orderStatusDTO = new OrderStatusDTO();
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 dff00ae56..17009d351 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
@@ -7060,7 +7060,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		//查询指定配送计划装车件数
 		DistributionLoadingNumDTO deliveryLoadingNum = distributionDeliveryListMapper.selectDeliveryLoadingNum(deliveryId);
-		log.info(">>>>>>>>>>>>>>> 车次状态维护2 代码执行 deliveryLoadingNum={}",deliveryLoadingNum);
+		log.info(">>>>>>>>>>>>>>> 车次状态维护2 代码执行 deliveryLoadingNum{}",deliveryLoadingNum);
 
 		int loadingNum = 0;
 		int deliveryQuantity = deliveryListEntity.getDeliveryNumber() + (Objects.isNull(deliveryListEntity.getInventoryNub()) ? 0 : deliveryListEntity.getInventoryNub());
@@ -7082,38 +7082,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		} else {
 			log.error(method + "查询配送无计划数量，deliveryId:{}", deliveryId);
 		}
-		//维护状态
-//		List<DistributionSignforEntity> list = distributionSignforService.list(Wrappers.<DistributionSignforEntity>query().lambda()
-//			.eq(DistributionSignforEntity::getDeliveryId, deliveryId)
-//		);
-//		List<DistributionReservationEntity> distributionReservationEntities = baseMapper.selectReservationByDeliveryListId(deliveryId);
-		//查询客户列表
-//		if (Func.isNotEmpty(distributionReservationEntities)){
-//			log.info(">>>>>>>>>>>>>>> 维护配送车次客户数量:{}",distributionReservationEntities.size());
-//			boolean flag = distributionReservationEntities.stream().allMatch(a -> ReservationSigningStatusConstant.yiqianshou.getValue().equals(a.getSigningStatus()));
-//			log.info(">>>>>>>>>>>>>>> 客户是否完全签收 代码执行 list:{}",flag);
-//			if (flag) {
-//				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
-//			}
-//		}else {
-//			//查询不出此配送任务存在预约信息，进行配送车次取消
-//			this.cancelDelivery(deliveryListEntity.getId());
-//			log.info(deliveryListEntity.getTrainNumber()+">>>>>>>>>>>>>>> 取消全部配送信息:{}",deliveryId);
-//			log.info(">>>>>>>>>>>>>>> 进行配送车次任务取消",deliveryId);
-//		}
 
-
-//		if (list.size()>0) {
-//			//查看所有的签收信息是否均已完成
-//			boolean anyMatch = list.stream().allMatch(s -> s.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue()));
-//			log.info(">>>>>>>>>>>>>>> 车次状态维护4 代码执行 anyMatch={}",anyMatch);
-//			log.info(">>>>>>>>>>>>>>> 当前车次复核数量:{}",			list.stream().filter(s -> s.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue())).count());
-//			if (anyMatch) {
-//				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
-//			}
-//		}else {
-//			log.error(method + "查询配送单签收信息错误，deliveryId:{}", deliveryId);
-//		}
 		//查询配送内有效的客户信息
 		List<DistributionSignforEntity> signforEntities = baseMapper.selectSignforByDeliveryId(deliveryId);
 		boolean flag = signforEntities.stream().allMatch(s -> SignforStatusConstant.yiqianshou.getValue().equals(s.getSigningStatus()));