From 5c527d419ca698d82e5e4f14a95628f3df9664bf Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 7 Sep 2024 15:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/distribution/vo/DisStockListDetailVO.java | 4 ++++
 .../logpm/distribution/vo/app/ReservationAppDetailVO.java    | 4 ++++
 .../distribution/mapper/DistributionDeliveryInfoMapper.xml   | 4 ++--
 .../service/impl/DistributionDeliveryInfoServiceImpl.java    | 1 +
 .../service/impl/DistributionDeliveryListServiceImpl.java    | 5 -----
 .../wrapper/DistributionDisStockListWrapper.java             | 5 ++++-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DisStockListDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DisStockListDetailVO.java
index b30f2f2a0..77d7dfa36 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DisStockListDetailVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DisStockListDetailVO.java
@@ -83,6 +83,10 @@ public class DisStockListDetailVO extends DisStockListDetailEntity {
 	 * 品牌
 	 */
 	private String brandName;
+	/**
+	 * 品牌
+	 */
+	private String stockupStatusName;
 
 
 
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/ReservationAppDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/ReservationAppDetailVO.java
index 63a2b7860..041d010f6 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/ReservationAppDetailVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/ReservationAppDetailVO.java
@@ -42,6 +42,10 @@ public class ReservationAppDetailVO implements Serializable {
 
 	private Integer loadingNub;
 
+	private Integer orderNum;
+
+	private Integer planNum;
+
 
 	private List<DisStockListDetailVO> disStockListDetailVOS ;
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 34751c8ba..cdc91314d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -995,8 +995,8 @@ FROM
         '否'
         ) AS isStock,
         IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscan WHERE reservation_id = ldr.id AND is_deleted = 0 AND scan_status != 1 ), 0 ) + IFNULL(( SELECT SUM( loaded_nub ) FROM logpm_distribution_loadscaninvn WHERE reservation_id = ldr.id AND scan_status != 1 AND is_deleted = 0 ), 0 ) AS loadingNub,
-        (ldr.reservation_num + ldr.reservation_stock_list_num) AS planNum
-
+        (ldr.reservation_num + ldr.reservation_stock_list_num) AS planNum,
+        IFNULL((SELECT COUNT(1) FROM logpm_distribution_reservation_stockarticle WHERE reservation_id = ldr.id AND is_deleted = 0 AND stock_article_status != 2),0 ) AS orderNum
         FROM
         logpm_distribution_reservation AS ldr
         WHERE
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
index 83f020d30..5c265433d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
@@ -931,6 +931,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 					sd.setCargoUnit(distributionStockListEntity.getCargoUnit());
 					sd.setCargoNorms(distributionStockListEntity.getCargoNorms());
 					sd.setCargoNumber(distributionStockListEntity.getCargoNumber());
+					sd.setCargoNumber(distributionStockListEntity.getCargoNumber());
 				}
 			});
 			reservationAppDetailVO.setDisStockListDetailVOS(disStockListDetailVOS);
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 5d6e440d2..d4a99c24c 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
@@ -973,7 +973,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										loadscanEntity.setPackageNub(parcelListEntity.getQuantity());
 										loadscanEntity.setPackageId(parcelListEntity.getId());
 										BladeUser user = AuthUtil.getUser();
-//										loadscanEntity.setScanUser(user.getUserName());
 										loadscanEntity.setScanUser(user.getNickName());
 										loadscanEntity.setWarehouseId(myCurrentWarehouse.getId());
 										loadscanEntity.setWarehouseName(myCurrentWarehouse.getName());
@@ -4698,7 +4697,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Integer.parseInt(IsOrNoConstant.yes.getValue()) == distributionDeliveryListEntity.getIsStart()) {
 			return Resp.scanFail("该车次已发车！", "该车次已发车!");
 		}
-		BladeUser user = AuthUtil.getUser();
 		Boolean isDriverFlag = judgeIsDriver(user);
 		if (!isDriverFlag){
 			return Resp.scanFail("当前操作人必须是司机！", "当前操作人必须是司机!");
@@ -4810,9 +4808,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		distributionPlanLogEntity.setOperator(user.getNickName());
 		distributionPlanLogEntity.setType(3);
 		distributionPlanLogService.save(distributionPlanLogEntity);
-
-
-
 	}
 
 	/**
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDisStockListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDisStockListWrapper.java
index 0567fe9c3..1beb0afa0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDisStockListWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDisStockListWrapper.java
@@ -26,7 +26,10 @@ public class DistributionDisStockListWrapper extends BaseEntityWrapper<DisStockL
 	public DisStockListDetailVO entityVO(DisStockListDetailEntity entity) {
 		DisStockListDetailVO disStockListDetailVO = Objects.requireNonNull(BeanUtil.copy(entity, DisStockListDetailVO.class));
 		disStockListDetailVO.setLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, entity.getStockLockingStatus()));
-//		disStockListDetailVO.setSigningStatusName(DictBizCache.getValue(DictBizConstant.OPS, entity.getStockSignfoStatus()));
+		disStockListDetailVO.setLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, entity.getStockLockingStatus()));
+		disStockListDetailVO.setSigningStatusName( entity.getStockSignfoStatus().equals("20")?"已签收":"待签收");
+		disStockListDetailVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STOCKUP_STATUS,entity.getStockStatus()));
+
 		return disStockListDetailVO;
 	}
 }