From 47db426c813156b687eaaa411d5377feb05c85ee Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 26 Apr 2024 20:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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 a57e6d52d..016c1852b 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
@@ -769,6 +769,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						log.error("配送计划预约类型错误:{}", reservationEntityList);
 					}
 				}
+				log.info("异常装车判定成功>>>>>>packageCode:{},reservationId:{}",distrilbutionloadingscanDTO.getBarcode(),distrilbutionloadingscanDTO.getReservationId());
 			}
 		} else if (distrilbutionloadingscanDTO.getType() == 2) {
 			log.info("#########!!!!!!!!!!!!!!!!!---------    000000000  type={}", distrilbutionloadingscanDTO.getType());
@@ -2064,6 +2065,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							.eq(DistributionParcelListEntity::getOrderPackageCode, disStockListDetailEntity.getStockPackageCode())
 							.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
 							.eq(DistributionParcelListEntity::getMaterialCode, disStockListDetailEntity.getSku())
+							.set(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
+							.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue())
+							.set(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yichuku.getValue())
+
 					);
 					log.info(">>>>>>>>>>>>>>>>>>>装车修改库存品包件>装车包件码:{},",disStockListDetailEntity.getStockPackageCode());
 					DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities);
@@ -2915,7 +2920,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							//添加该订单下可操作包件至计划中
 							//没有进行包件选择  默认添加可配送的所有包件
 							//添加订单下的所有在库订单的包件
-							List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, s.getId()).ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue()).ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue()).notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()}));
+							List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+								.eq(DistributionParcelListEntity::getStockArticleId, s.getId())
+								.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
+								.ne(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.yiyueyue.getValue())
+								.notIn(DistributionParcelListEntity::getOrderPackageStatus, new String[]{OrderPackageStatusConstant.yichuku.getValue(), OrderPackageStatusConstant.yiqianshou.getValue()})
+							);
 							if (Func.isEmpty(distributionParcelListEntities)) {
 								throw new RuntimeException(s.getOrderCode() + "无可用数量");
 							}