修复PC签收库存品签收数量维护

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

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());
 
 						//维护预约库存品数据
 						//扣减库存