自提备货BUG修复

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

@@ -6334,7 +6334,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				if (!stockListId.equals(disStockListDetailEntity.getStockListId())){
 					//对已有计划进行减少
 					DistributionDeliveryDetailsEntity deliveryDetails = distributionDeliveryDetailsEntities.stream().filter(f -> !Objects.equals(f.getQuantity(), f.getRealityQuantity())).collect(Collectors.toList()).get(0);
-					deliveryDetails.setQuantity(deliveryDetails.getQuantity() - 1);
+					int updateNum = deliveryDetails.getQuantity() - 1;
+					if (Objects.equals(updateNum,deliveryDetails.getRealityQuantity())) {
+						deliveryDetails.setStockStatus("3");
+					}
+					deliveryDetails.setQuantity(updateNum);
 					distributionDeliveryDetailsService.updateById(deliveryDetails);
 					distributionStockListMapper.decreaseStockListQuantityOccupied(stockListId, 1);
 					distributionStockListMapper.updateInventoryQuantityOccupied(distributionStockListEntity.getId(), 1);
@@ -6353,6 +6357,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				disStockListDetailEntity.setStockPackageCode(one.getCode());
 				disStockListDetailEntity.setStockType(InventoryStockTypeStatusConstant.shengcheng.getValue());
 				disStockListDetailEntity.setStockListId(distributionStockListEntity.getId());
+				disStockListDetailService.updateById(disStockListDetailEntity);
 				distributionStockListService.updateById(distributionStockListEntity);
 				distributionStockListMapper.updateInventoryQuantityOccupied(disStockListDetailEntity.getStockListId(), disStockListDetailEntity.getNum());
 				distributionStockListMapper.decreaseStockListQuantityOccupied(stockListId, num);
@@ -6360,7 +6365,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				distrilbutionBillLadingService.maintenanceStockListStockup(reservationId, stockListId, myCurrentWarehouse.getId());
 				//对原计划进行减少
 				DistributionDeliveryDetailsEntity deliveryDetails = distributionDeliveryDetailsEntities.stream().filter(r -> !Objects.equals(r.getQuantity(), r.getRealityQuantity())).collect(Collectors.toList()).get(0);
-				deliveryDetails.setQuantity(deliveryDetails.getQuantity() - 1);
+				int updateNum = deliveryDetails.getQuantity() - 1;
+				if (Objects.equals(updateNum,deliveryDetails.getRealityQuantity())) {
+					deliveryDetails.setStockStatus("3");
+				}
+				deliveryDetails.setQuantity(updateNum);
 				distributionDeliveryDetailsService.updateById(deliveryDetails);
 			}
 		}