From 46cffa79bafc68964140adbb2387f0b8397ab612 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 28 Dec 2023 18:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E8=BD=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=A1=A5=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/loading/LoadingStatusConstant.java   |  3 ++-
 .../impl/DistributionDeliveryListServiceImpl.java |  3 +++
 .../impl/DistributionSignforServiceImpl.java      | 15 +++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
index fefc38bae..d120b356f 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadingStatusConstant.java
@@ -10,7 +10,8 @@ public enum LoadingStatusConstant {
 	quxiao("取消","1"),
 	saomiao("扫描","2"),
 	queren("确认","3"),
-	yijianzhuangche("一键装车","4");
+	yijianzhuangche("一键装车","4"),
+	bulu("补录","5");
 
 
 	/**
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 76263ea5b..ee3da8a78 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
@@ -4147,6 +4147,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									case "4":
 										parcelListVO.setScanStatus(LoadingStatusConstant.yijianzhuangche.getName());
 										break;
+									case "5":
+										parcelListVO.setScanStatus(LoadingStatusConstant.bulu.getName());
+										break;
 								}
 								parcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
 							}
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 d942cefff..31beacbf6 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
@@ -905,6 +905,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId());
 				}
 				distributionLoadscanEntity.setScanTime(signingTime);
+				distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
 				distributionLoadscanEntity.setPackageId(collect.get(0).getId());
 				distributionLoadscanEntity.setOrderPackageCode(distrilbutionloadingscanDTO.getBarcode());
 				distributionLoadscanEntity.setSigningTime(signingTime);
@@ -1270,6 +1271,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						//修改签收数量
 //				Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						if (Func.isEmpty(loadscanEntity)) {
+							distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
 							//更新装车包件数和签收包件数
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							//更新装车和签收数
@@ -1337,6 +1339,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
 						distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
 						if (Func.isEmpty(loadscanEntity)){
+							distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						}else {
@@ -1389,8 +1392,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			this.updateById(signforEntity);
 			//修改包件的签收数量
 			distributionParcelListMapper.updateOrderPackageCodeById(parcelListEntity.getId(),OrderPackageStatusConstant.yiqianshou.getValue());
-			//还需要维护包件状态
-			distributionAsyncService.maintenanceOrderStatus(parcelListEntity.getOrderCode(),parcelListEntity.getWarehouseId());
 		} else {
 			log.error("############出现相同的包件码:{}", distrilbutionloadingscanDTO.getBarcode());
 			return Resp.scanFail("操作失败", "包件信息有误");
@@ -1662,7 +1663,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscaninvnEntity.setScanUser(user.getUserName());
 					distributionLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date()));
 					distributionLoadscaninvnEntity.setPackageNub(inventory.get(0).getNum());
-					distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
+					distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
 					distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
 					distributionLoadscaninvnEntity.setScanType("1");
 					distributionLoadscaninvnEntity.setType(2);
@@ -2315,7 +2316,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						newLoadscaninvnEntity.setScanUser(user.getNickName());
 						newLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date()));
 						newLoadscaninvnEntity.setPackageNub(detailEntity.getNum());
-						newLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
+						newLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
 						newLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
 						newLoadscaninvnEntity.setScanType("1");
 						newLoadscaninvnEntity.setType(2);
@@ -2459,7 +2460,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
 					}
 					loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
-					loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
+					loadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
 					loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
 					loadscanEntity.setScanType("1");
 					loadscanEntity.setType(2);
@@ -2541,7 +2542,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
 					}
 					loadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
-					loadscanEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
+					loadscanEntity.setScanStatus(LoadingStatusConstant.bulu.getValue());
 					loadscanEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
 					loadscanEntity.setScanType("1");
 					loadscanEntity.setType(2);
@@ -2601,8 +2602,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				String orderCode = orderCodes.stream().distinct().collect(Collectors.joining(","));
 				distributionStockArticleService.maintenanceOrderInfo(orderCode,myCurrentWarehouse.getId());
 			}
-
-
 			if (Func.isNotEmpty(packageIds)) {
 				distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId());
 				//批量推送