零担计划调整、PDA装车、签收计划数量维护

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -1709,10 +1709,9 @@
         ldsa.service_number AS serviceNumber,
         ldpl.quantity AS quantity,
         ldpl.id AS id,
-        ldpl.order_package_reservation_status AS orderPackageReservationStatusName,
         ldrzp.quantity AS reservationNum,
         IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS loadingNum,
-        ldrzp.quantity = IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS  signingNum ,
+        IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS  signingNum ,
         CASE IF(ldl.loaded_nub is null,0,ldl.loaded_nub)
         WHEN 0 THEN '待装车'
         ELSE IF(ldl.loaded_nub = ldrzp.quantity,'已装车','部分装车')

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -587,7 +587,7 @@
         ldsa.create_time,
         ldsa.update_user,
         ldsa.update_time,
-        (ldsa.incoming_num - ldsa.delivery_quantity ) AS handQuantity,
+        ldsa.hand_quantity AS handQuantity,
         ldsa.status, ldsa.is_deleted, ldsa.create_dept,
         ldsa.reserve1, ldsa.reserve2, ldsa.reserve3, ldsa.reserve4, ldsa.reserve5,
         ldsa.service_number, ldsa.order_code,

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

@@ -2236,6 +2236,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	}
 
 	@Override
+	@Transactional
 	public void changeOrderReservationStatus(DistributionStockArticleDTO stockArticleDTO) {
 		Long id = stockArticleDTO.getId();
 		DistributionStockArticleEntity stockArticleEntity = Func.copy(stockArticleDTO, DistributionStockArticleEntity.class);
@@ -2258,9 +2259,14 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			List<DistributionParcelNumberEntity> parcelNumberEntities = distributionParcelNumberService.list(Wrappers.<DistributionParcelNumberEntity>query().lambda()
 				.eq(DistributionParcelNumberEntity::getStockArticleId, stockArticleDTO.getId()));
 			AtomicInteger unavailableNum = new AtomicInteger();
-			parcelNumberEntities.forEach(p -> {
-				unavailableNum.getAndAdd(p.getOutboundQuantity() + p.getDeliveryQuantity());
-			});
+//			parcelNumberEntities.forEach(p -> {
+//				unavailableNum.getAndAdd(p.getOutboundQuantity() + p.getDeliveryQuantity());
+//			});
+			if (Func.isNotEmpty(parcelNumberEntities)){
+				int sum = parcelNumberEntities.stream().mapToInt(p -> p.getOutboundQuantity() + p.getDeliveryQuantity()).sum();
+				unavailableNum.getAndAdd(sum);
+				log.info("################零担包件当前不可用数量:{}",sum);
+			}
 			if (unavailableNum.get() == stockArticleDTO.getHandQuantity()) {
 				stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
 			} else if (unavailableNum.get() < stockArticleDTO.getHandQuantity()) {

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

@@ -540,7 +540,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 			return null;
 		}
 		IPage<DistributionReservationZeroPackageVO> reservationInventoryPackageVOIPage = distributionReservationMapper.selectZeroPackageByReservationInfo(reservationPackageDTO,page);
-		return reservationInventoryPackageVOIPage;
+ 		return reservationInventoryPackageVOIPage;
 	}
 
 

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

@@ -2266,6 +2266,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						}
 					}
 				}
+				stockArticleDTO.setHandQuantity(s.getHandQuantity());
 				reservationStockarticleEntity.setReservationNum(reservationOrderNum.get());
 				reservationStockarticleEntity.setReservationId(reservationEntity.getId());
 				reservationStockarticleEntity.setIsZero(s.getIsZero());

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

@@ -2972,7 +2972,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			List<DistributionParcelListEntity> parcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distributionAppDeliveryListVO.getId());
 
 			distributionAppDeliveryListVO.setInventoryNub(0);
-			distributionAppDeliveryListVO.setDeliveryNumber(0);
+//			distributionAppDeliveryListVO.setDeliveryNumber(0);
 			AtomicInteger deliveryNub = new AtomicInteger();
 			if (Func.isNotEmpty(inventory)) {
 				int inventoryNub = inventory.stream().mapToInt(DisStockListDetailEntity::getNum).sum();
@@ -3097,6 +3097,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					}
 				});
 				distributionAppDeliveryListVO.setDriverName(stringBuilder.toString());
+//				distributionAppDeliveryListVO.setDeliveryNumber(7);
 			}
 
 		}