From d06f97a438639b32d06f183be8bf02293c34ea5c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 18 Dec 2023 15:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=A3=85=E8=BD=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionStockListMapper.java     |  8 ++++++++
 .../mapper/DistributionStockListMapper.xml      |  3 +++
 .../DistributionDeliveryListServiceImpl.java    |  8 +++-----
 .../DistributionReservationServiceImpl.java     | 17 ++++++++++++-----
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
index 219635c86..a13815b10 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
@@ -119,4 +119,12 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
     int deductionQuantityStock(@Param("stockListId") Long inventoryId,@Param("decreaseNum") Integer loadedNub);
 
     void updeteSourceTypeById(@Param("sourceType") String sourceType, @Param("stockListId") Long stockListId);
+
+	/**
+	 *
+	 * @param id
+	 * @param reservationNum
+	 * @return
+	 */
+    int updateInventoryQuantityOccupied(@Param("stockListId") Long id,@Param("reservationNum") Integer reservationNum);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index 1c7ddbcb0..989d84e26 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -511,5 +511,8 @@
         set source_type = #{sourceType}
         where id = #{stockListId}
     </update>
+    <update id="updateInventoryQuantityOccupied">
+        UPDATE logpm_distribution_stock_list SET quantity_occupied = (quantity_occupied + #{reservationNum}) WHERE id = #{stockListId}
+    </update>
 
 </mapper>
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 abd78265f..3b8756aab 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
@@ -1446,12 +1446,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		Map<String, List<DistributionReservationStockarticleEntity>> allStockArticle = reservationStockarticleEntityList.stream().filter(f -> Func.isNotEmpty(f.getIsZero())).collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getIsZero));
 		DistributionDeliverySelfEntity finalDistributionDeliverySelfEntity = distributionDeliverySelfEntity;
+		List<DistributionParcelListEntity> updatePackageList = new ArrayList<>();
 		for (DistributionReservationStockarticleEntity reservationStockarticleEntity : reservationStockarticleEntityList) {
 			switch (reservationStockarticleEntity.getIsZero()) {
 				case "0":
 					//订制品
 //					v.forEach(ord -> {
-					List<DistributionParcelListEntity> updatePackageList = new ArrayList<>();
 					List<DistributionParcelListEntity> parcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(distrilbutionloadingscanDTO.getReservationId(), reservationStockarticleEntity.getStockArticleId());
 					for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
 						DistributionLoadscanEntity packageLoadingScan = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()).eq(DistributionLoadscanEntity::getOrderId, reservationStockarticleEntity.getStockArticleId()).eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId()).ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()));
@@ -1516,9 +1516,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						//异步修改包件状态
 //							distributionAsyncService.changeMarketDeliveryListStatus(loadscanEntity.getOrderPackageCode(), loadscanEntity.getDeliveryId());
 					}
-					distributionAsyncService.updatepackageListLoadingStatus(updatePackageList,myCurrentWarehouse.getId());
-
-
 //					});
 					break;
 				case "1":
@@ -1723,7 +1720,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				}
 			}
 		}
-			///包件下架
+			//包件维护下架和装车状态
+		distributionAsyncService.updatepackageListLoadingStatus(updatePackageList,myCurrentWarehouse.getId());
 
 		return Resp.scanSuccess("操作成功", "装车成功");
 	}
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 5292dfbcd..6165aa2ab 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
@@ -113,6 +113,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 	@Autowired
 	private IDistributionStockListService distributionStockListService;
 
+	@Autowired
+	private DistributionStockListMapper distributionStockListMapper;
+
 	@Autowired
 	private IDistributionDeliveryListService distributionDeliveryListService;
 
@@ -1789,11 +1792,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				reservationStocklistEntity.setSigningStatus(ReservationInventorySigningStatusConstant.weiqianshou.getValue());
 				reservationStocklistEntity.setRealityNum(0);
 				distributionReservationStocklistService.save(reservationStocklistEntity);
-				//TODO 这里新增还需要对库存品的数量进行修改
-				DistributionStockListEntity stockListEntity = Func.copy(distributionStockListDTO, DistributionStockListEntity.class);
-				Integer quantityOccupied = stockListEntity.getQuantityOccupied();
-				stockListEntity.setQuantityOccupied(quantityOccupied + reservationStocklistEntity.getReservationNum());
-				distributionStockListService.updateById(stockListEntity);
+//				DistributionStockListEntity stockListEntity = Func.copy(distributionStockListDTO, DistributionStockListEntity.class);
+//				Integer quantityOccupied = stockListEntity.getQuantityOccupied();
+//				stockListEntity.setQuantityOccupied(quantityOccupied + reservationStocklistEntity.getReservationNum());
+//				distributionStockListService.updateById(stockListEntity);
+				//维护对应库存品的冻结数量
+				int a = distributionStockListMapper.updateInventoryQuantityOccupied(distributionStockListDTO.getId(),distributionStockListDTO.getReservationNum());
+
+
+
 				//对新增的库存品进行明细记录添加
 				List<DisStockListDetailEntity> detailEntities = new ArrayList<>();
 				for (int j = 0; j < distributionStockListDTO.getReservationNum(); j++) {