From 7270b03bf4d45d1cccd60ff0917d354e8cfc7de2 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 29 Apr 2024 10:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPC=E7=AD=BE=E6=94=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionReservationMapper.xml           |  4 ++--
 .../service/impl/DistributionSignforServiceImpl.java   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index ade2ad7f8..5c9cb09c3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -1804,12 +1804,12 @@
         END loadingStatusName,
         CASE IF(ldl.received_quantity is null,0,ldl.loaded_nub)
         WHEN 0 THEN '待签收'
-        ELSE IF(ldl.received_quantity = ldrzp.quantity,'已签收','部分签收')
+        ELSE IF(ldl.received_quantity = 0,'未签收',IF(ldl.received_quantity = ldrzp.quantity,'已签收','部分签收'))
         END signingStatusName,
         ldl.scan_user AS scanUser,
         ldl.scan_time AS scanTime,
         ldl.signing_user AS signingUser,
-        ldl.signing_time AS signingTime
+        MAX(ldl.signing_time) AS signingTime
         FROM
         logpm_distribution_reservation_zero_package AS ldrzp
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrzp.parcel_list_id = ldpl.id
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 0623db29a..68a46dd50 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
@@ -721,7 +721,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						loadscaninvnEntity.setOneQclick(1);
 						distributionLoadscaninvnService.updateById(loadscaninvnEntity);
 						//维护签收数量
-						Integer j = distributionSignforMapper.updateSignforNum(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
+						Integer j = distributionSignforMapper.updatesignforByinvn(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), loadscaninvnEntity.getPackageNub());
 						//更新签收人
 						Integer i = distributionSignforMapper.updateSignUser(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), user);
 					} else {
@@ -781,7 +781,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
 						distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
 						//更新装车数量
-						Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getPackageNub());
+						Integer j = distributionSignforMapper.updateLoadAndsignforByinvn(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), distributionLoadscaninvnEntity.getPackageNub());
 						//更新签收人
 						Integer i = distributionSignforMapper.updateSignUser(distributionLoadscaninvnEntity.getDeliveryId(), distributionLoadscaninvnEntity.getReservationId(), AuthUtil.getUser());
 						//扣减库存
@@ -1292,11 +1292,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //				loadscanEntity.setSigningTime(new Date().toString());
 			loadscanEntity.setReceivedQuantity(reservationZeroPackageEntities.getQuantity());
 			loadscanEntity.setLoadedNub(reservationZeroPackageEntities.getQuantity());
-			loadscanEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
 			loadscanEntity.setPackageNub(reservationZeroPackageEntities.getQuantity());
+			loadscanEntity.setSigningUserId(user.getUserId());
 			loadscanEntity.setSigningTime(simpleDateFormat.format(new Date(System.currentTimeMillis() + (6 * 1000))));
 			loadscanEntity.setMsg("文员进行签收补录");
-
 			distributionLoadscanService.updateById(loadscanEntity);
 			distributionParcelNumberEntity.setHandQuantity(a);
 			distributionParcelNumberEntity.setSigninQuantity(b);
@@ -3450,7 +3449,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscaninvnEntity.setScanUser(user.getNickName());
 					distributionLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date()));
 					distributionLoadscaninvnEntity.setPackageNub(inventory.get(0).getNum());
-					distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
+					distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.saomiao.getValue());
 					distributionLoadscaninvnEntity.setIsInsert(LoadingIsInsertConstant.bulu.getValue());
 					distributionLoadscaninvnEntity.setScanType("1");
 					distributionLoadscaninvnEntity.setType(2);
@@ -4656,6 +4655,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						distributionLoadscaninvnService.save(newLoadscaninvnEntity);
 						packageLockIds.add(newLoadscaninvnEntity.getInventoryPackageId());
+						Integer j = distributionSignforMapper.updatesignforByinvn(newLoadscaninvnEntity.getDeliveryId(), newLoadscaninvnEntity.getReservationId(), newLoadscaninvnEntity.getPackageNub());
 
 						//维护预约库存品数据
 						//扣减库存