From a6e053ae9a633ed27d47804f795a5298b6ec68ef Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 9 Jan 2024 17:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=85=8D=E9=80=81=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E4=B8=BA0=E7=9A=84=E9=85=8D=E9=80=81=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=92=8C=E9=A2=84=E7=BA=A6=E4=BB=BB=E5=8A=A1=E3=80=81?=
 =?UTF-8?q?PC=E7=AD=BE=E6=94=B6=E5=BA=93=E5=AD=98=E5=93=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryInfoMapper.xml  | 4 ++--
 .../distribution/mapper/DistributionDeliveryListMapper.xml  | 2 +-
 .../service/impl/DistributionReservationServiceImpl.java    | 6 +++---
 .../service/impl/DistributionSignforServiceImpl.java        | 4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

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 940a009da..8da37d894 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
@@ -121,7 +121,7 @@
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         <where>
-            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40
+            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
         </where>
     </select>
     <select id="selectDistributionDeliverywrapInfoPage"
@@ -678,7 +678,7 @@ FROM
         logpm_distribution_signfor lds
         JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id
         <where>
-            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40
+            lds.is_deleted = 0 and lds.delivery_id = #{id} and ldr.reservation_status != 40 AND (ldr.reservation_num + ldr.reservation_stock_list_num) > 0
             <if test="param.reservationCode != '' and param.reservationCode != null">
                 and ldr.reservation_code like concat('%',#{param.reservationCode},'%')
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index cf46a25ab..8eb691651 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -210,7 +210,7 @@
         left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id
         LEFT JOIN logpm_distribution_reservation ldr on ldr.id = lds.reservation_id
         <where>
-            lddl.is_deleted = 0
+            lddl.is_deleted = 0 AND (IF(lddl.delivery_number is null ,0,lddl.delivery_number) + IF(lddl.inventory_nub is null ,0,lddl.inventory_nub)) > 0
             <if test="param.trainNumber != null and param.trainNumber!=''">
                 and lddl.train_number like concat('%',#{param.trainNumber},'%')
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 2e98fa1e1..60befb169 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -3626,9 +3626,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	public void maintenanceReservationNum(Long reservationId) {
 		DistributionReservationEntity reservationEntity = this.getById(reservationId);
 		if (Func.isNotEmpty(reservationEntity)){
-			List<DistributionReservationStockarticleEntity> distributionReservationStockarticleEntities = distributionReservationMapper.selectStockArticleByReservationId(reservationId);
-			if (Func.isNotEmpty(distributionReservationStockarticleEntities)){
-				int sum = distributionReservationStockarticleEntities.stream().mapToInt(DistributionReservationStockarticleEntity::getReservationNum).sum();
+			List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);
+			if (Func.isNotEmpty(distributionParcelListEntities)){
+				int sum = distributionParcelListEntities.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 				reservationEntity.setReservationNum(sum);
 			}
 			List<DistributionReservationStocklistEntity> reservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(reservationId);
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 d777fe226..0b74915f2 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
@@ -504,7 +504,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		if (Func.isEmpty(distrilbutionloadingscanDTO.getBarcodes())){
 			log.error(method+"barCode参数缺失");
-			return R.fail("请联系管理员!!!");
+			return R.fail("此库存品暂未进行备货，请联系管理员!!!");
 		}
 		String[] split = distrilbutionloadingscanDTO.getBarcodes().split(",");
 		List<DisStockListDetailEntity> detailEntities = distributionReservationMapper.selectInventoryListByReservation(distrilbutionloadingscanDTO.getReservationId());
@@ -569,6 +569,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscaninvnEntity.setLoadingId(distributionDeliverySelfEntity.getId().toString());
 						distributionLoadscaninvnEntity.setOrderPackageCode(inventoryPackage.get(0).getStockPackageCode());
 						distributionLoadscaninvnEntity.setInventoryId(inventoryPackage.get(0).getStockListId());
+						distributionLoadscaninvnEntity.setInventoryPackageId(inventoryPackage.get(0).getId());
 						distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 						distributionLoadscaninvnEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscaninvnEntity.setScanUser(user.getNickName());
@@ -598,6 +599,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//修改对应库存品包件的签收数量
 					DisStockListDetailEntity disStockListDetailEntity = inventoryPackage.get(0);
 					disStockListDetailEntity.setStockSignfoStatus(InventorySigningStatusConstant.yiqianshou.getValue());
+					disStockListDetailEntity.setStockLockingStatus(InventoryLoadingStatusConstant.yizhuangche.getValue());
 					disStockListDetailService.updateById(disStockListDetailEntity);
 				}else {
 					//出现不属于当前客户的库存品包件信息