批量签收数量维护

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -5414,22 +5414,24 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			if (packageLoadingData.isEmpty() && inventoryLoadingData.isEmpty()) {
 				return Resp.scanFail("当前客户未进行装车操作", "当前客户未进行装车操作");
 			}
-			log.info(">>>>>>>>>>>>>>>>>>>开始批量装车:{}", distributionSignforEntity.getDeliveryId());
+			int signNum = 0;
-				if (!packageLoadingData.isEmpty()) {
+			if (!packageLoadingData.isEmpty()) {
-					log.info(">>>>>>>>>>>>>>>>>>>开始批量装车,处理装车包件:{}", distributionSignforEntity.getDeliveryId());
+				signNum += packageLoadingData.stream().mapToInt(DistributionLoadscanEntity::getReceivedQuantity).sum();
+				receivedQuantity += packageLoadingData.stream().mapToInt(DistributionLoadscanEntity::getPackageNub).sum();
+				//进行订制品和零担的批量签收
+				handlePackageLoadingData(packageLoadingData, user, distributionLoadscanEntityLists, orderCodes);
+			}
 
-					receivedQuantity += packageLoadingData.stream().mapToInt(DistributionLoadscanEntity::getPackageNub).sum();
+			if (!inventoryLoadingData.isEmpty()) {
-					//进行订制品和零担的批量签收
+				signNum += inventoryLoadingData.stream().mapToInt(DistributionLoadscaninvnEntity::getReceivedQuantity).sum();
-					handlePackageLoadingData(packageLoadingData, user, distributionLoadscanEntityLists, orderCodes);
+				receivedinQuantity += inventoryLoadingData.stream().mapToInt(DistributionLoadscaninvnEntity::getPackageNub).sum();
-				}
+				//进行订制品和零担的批量签收
+				handleInventoryLoadingData(inventoryLoadingData, user, distributionLoadscaninvnEntityLists);
+			}
+			if (signNum > 0){
+				distributionSignforMapper.deductionSignforPacjageNum(distributionSignforEntity.getDeliveryId(), distributionSignforEntity.getReservationId(), signNum);
+			}
 
-				if (!inventoryLoadingData.isEmpty()) {
-					log.info(">>>>>>>>>>>>>>>>>>>开始批量装车,处理装车库存品:{}", distributionSignforEntity.getDeliveryId());
-					receivedinQuantity += inventoryLoadingData.stream().mapToInt(DistributionLoadscaninvnEntity::getPackageNub).sum();
-					//进行订制品和零担的批量签收
-					handleInventoryLoadingData(inventoryLoadingData, user, distributionLoadscaninvnEntityLists);
-				}
-			log.info(">>>>>>>>>>>>>>>>>>>开始处理批量装车完毕:{}", distributionSignforEntity.getDeliveryId());
 			//维护签收数量
 			distributionSignforEntity.setReceivedinQuantity(receivedinQuantity);
 			distributionSignforEntity.setReceivedQuantity(receivedQuantity);
@@ -5881,7 +5883,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + ":reservationId:", distributionSignfor.getReservationId(), 60L);
 		NodeFanoutMsg<org.springblade.common.model.DistributionSignforVO> nodeFanoutMsg = buildNodeFanoutMsgByOneClick(distributionDeliveryListEntity, reservationEntity, distributionLoadscaninvnEntityLists, distributionLoadscanEntityLists);
 		iDistributionNodeWorkService.signFor(nodeFanoutMsg, AuthUtil.getUser());
-		return Resp.scanSuccess((distributionSignforEntity.getReceivedinQuantity()+distributionSignforEntity.getReceivedQuantity())+"件",(distributionSignforEntity.getReceivedinQuantity()+distributionSignforEntity.getReceivedQuantity())+"件");
+		return Resp.scanSuccess((distributionSignforEntity.getReceivedinQuantity() + distributionSignforEntity.getReceivedQuantity()) + "件", (distributionSignforEntity.getReceivedinQuantity() + distributionSignforEntity.getReceivedQuantity()) + "件");
 	}
 
 	private DistributionDeliverySelfEntity getDriver(DistributionDeliveryListEntity distributionDeliveryListEntity, BladeUser user, Boolean isDriverFlag) {
@@ -5947,10 +5949,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		List<DistributionLoadscanEntity> updatePackageLoadingData = new ArrayList<>();
 		List<Long> packageIds = new ArrayList<>();
 		for (DistributionLoadscanEntity packageLoadingDatum : packageLoadingData) {
-			if ((packageLoadingDatum.getLoadedNub() - packageLoadingDatum.getReceivedQuantity()) > 0) {
-				//存在装车和签收数量不一致，回退签收数量
-				distributionSignforMapper.deductionSignforPacjageNum(packageLoadingDatum.getDeliveryId(), packageLoadingDatum.getReservationId(), packageLoadingDatum.getReceivedQuantity());
-			}
 			packageLoadingDatum.setReceivedQuantity(packageLoadingDatum.getLoadedNub());
 			packageLoadingDatum.setSignforType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue());
 			packageLoadingDatum.setOneClick(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getValue());