From ced86e4d156f0791f95ccd9cb83ba6c41fdf54dc Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 21 Dec 2023 13:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E4=BA=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml  | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 10beb7549..470ecc708 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -849,7 +849,7 @@
         where order_code = #{orderCode}
     </update>
     <update id="deductionHandQuantity">
-        UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity - #{deductionNum}) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0
+        UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity - 1) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0
     </update>
     <update id="augmentHandQuantity">
         UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity + #{augmentNum}) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0
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 56d1821e6..09a9b4596 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
@@ -683,8 +683,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//缺少一个异步维护包件签收的方法
 //				distributionAsyncService.changeOrderSignforStatus(collect.get(0));
 				Integer j = distributionSignforMapper.updateSignforNum(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+				//更新签收人
+				Integer m = distributionSignforMapper.updateSignUser(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), AuthUtil.getUser());
 				warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
-
 			} else {
 				//这里装车的数据需要进行补录
 				DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -735,6 +736,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionLoadscanEntity.setSignforState(2);
 				distributionLoadscanEntity.setPackageNub(collect.get(0).getQuantity());
 				distributionLoadscanEntity.setOrderId(collect.get(0).getStockArticleId());
+				distributionLoadscanEntity.setLoadedNub(collect.get(0).getQuantity());
 				distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 				distributionLoadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 //				distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
@@ -1353,6 +1355,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscaninvnService.updateById(loadscaninvnEntity);
 					//维护签收数量
 					Integer j = distributionSignforMapper.updateSignforNum(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
+					//更新签收人
+					Integer i = distributionSignforMapper.updateSignUser(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), user);
 				} else {
 					//库存品未进行装车
 					//这里装车的数据需要进行补录