订单维护BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -254,7 +254,6 @@ public class DistributionStockupAppController extends BladeController {
 					}
 					map.put("orderList", collect);
 				}
-
 			} else {
 				//查询备货区信息
 				DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId);
@@ -1228,7 +1227,7 @@ public class DistributionStockupAppController extends BladeController {
 						);
 						DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(s -> Func.isBlank(s.getStockPackageCode())).collect(Collectors.toList()).get(0);
 						disStockListDetailEntity.setStockListId(rs.getStocklistId());
-						disStockListDetailEntity.setStockStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
+//						disStockListDetailEntity.setStockStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 						disStockListDetailService.updateById(disStockListDetailEntity);
 					}else {
 						//判断是否是为增加库存品进行数据维护
@@ -1274,6 +1273,7 @@ public class DistributionStockupAppController extends BladeController {
 							List<DisStockListDetailEntity> collect = oldRsPack.stream().filter(f -> Func.isBlank(f.getStockPackageCode())).collect(Collectors.toList());
 							DisStockListDetailEntity disStockListDetailEntity = collect.get(0);
 							disStockListDetailEntity.setStockListId(reservationStocklistEntity.getStocklistId());
+//							disStockListDetailEntity.setStockStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 							disStockListDetailService.updateById(disStockListDetailEntity);
 
 							reservationStocklistEntity.setReservationNum(reservationStocklistEntity.getReservationNum() + 1 );

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

@@ -1541,7 +1541,12 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					}
 
 				}
-				inWarehouseQuantity += stockArticleEntity.getTotalNumber() - loadingQuantity;
+				int sum = parcelListEntities.stream().filter(f -> !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())
+					|| !OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus())
+					|| !OrderPackageReservationStatusConstant.yiyueyue.getValue().equals(f.getOrderPackageReservationStatus())
+				).mapToInt(DistributionParcelListEntity::getQuantity).sum();
+				log.info("####################维护订单在库数量>>>>>>>>>>>>>>>>,:{}",stockArticleEntity.getOrderCode()+sum);
+				inWarehouseQuantity = sum;
 
 				stockArticleEntity.setHandQuantity(inWarehouseQuantity);
 				stockArticleEntity.setDeliveryQuantity(deliveryQuantity);

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

@@ -2302,6 +2302,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				}
 				//绑定码
 				disStockListDetail.setStockPackageCode(stockupDTO.getPacketBarCode());
+				disStockListDetail.setStockStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 				disStockListDetail.setId(list1.get(0).getId());
 				break;
 			case 2:
@@ -2315,6 +2316,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				if (ObjectUtils.isNotNull(one1)) {
 					//绑定码
 					disStockListDetail.setStockPackageCode(stockupDTO.getPacketBarCode());
+					disStockListDetail.setStockStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
 					disStockListDetail.setId(list1.get(0).getId());
 					//修改包件码状态
 					ordercodeRecoEntity.setCodeStatus("1");