代码提交

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDetailVO.java

@@ -62,6 +62,7 @@ public class DistributionAppDetailVO  implements Serializable {
 
 	private List<DistributionAppStockArticleVO> distributionAppStockArticleVOS;
 	private List<DistributionAppStockArticleVO> distributionAppZeroStockArticleVOS;
+	private List<DistributionAppStockListVO> distributionAppStockListVOS ;
 
 
 

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

@@ -7991,12 +7991,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				break;
 			case 3:
 				//库存品
-				List<DistributionAppStockListVO> distributionAppStockListVOS = handleAppDeliveryInventory(distributionAppDeliveryListDTO,myCurrentWarehouse);
+				List<DistributionAppStockListVO> distributionAppStockListVOS = handleAppDeliveryInventory(distributionAppDeliveryListDTO, myCurrentWarehouse);
-
+				detailVO.setDistributionAppStockListVOS(distributionAppStockListVOS);
 				break;
 		}
-
-
 		return R.data(detailVO);
 	}
 
@@ -8016,18 +8014,21 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				DistributionAppStockListVO distributionAppStockListVO = new DistributionAppStockListVO();
 				distributionAppStockListVO.setGoodsName(entityList.get(0).getDescriptionGoods());
 				distributionAppStockListVO.setCargoNumber(entityList.get(0).getCargoNumber());
-//				inventoryPackageMap.get()
+				List<Long> inventoryIds = entityList.stream().map(DistributionStockListEntity::getId).collect(Collectors.toList());
-//				distributionAppStockListVO.setPlanNum();
+				Integer planNum = 0;
-
+				Integer scanNum = 0;
+				for (Long inventoryId : inventoryPackageMap.keySet()) {
+					if (inventoryIds.contains(inventoryId)){
+						List<DisStockListDetailEntity> entityList1 = inventoryPackageMap.get(inventoryId);
+						planNum += entityList1.stream().mapToInt(DisStockListDetailEntity::getNum).sum();
+						scanNum += entityList1.stream().filter(f->InventoryLoadingStatusConstant.yizhuangche.getValue().equals(f.getStockLockingStatus())).mapToInt(DisStockListDetailEntity::getNum).sum();
+					}
+				}
+				distributionAppStockListVO.setPlanNum(planNum);
+				distributionAppStockListVO.setScanNum(scanNum);
+				distributionAppStockListVOS.add(distributionAppStockListVO);
 			}
-			map.forEach((k,v)->{
-				DistributionAppStockListVO distributionAppStockListVO = new DistributionAppStockListVO();
-
-			});
-
-
 		}
-
 		return distributionAppStockListVOS;
 	}
 

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

@@ -3752,7 +3752,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<Long> ids = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
 			//查询包件
 			List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListService.listByIds(ids);
-			List<Long> packageIds = distributionParcelListEntities.stream().filter(f -> !OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(f.getOrderPackageLoadingStatus()) || !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList());
+			List<Long> packageIds = distributionParcelListEntities.stream().filter(f -> !OrderPackageStatusConstant.yiqianshou.getValue().equals(f.getOrderPackageStatus())).map(DistributionParcelListEntity::getId).collect(Collectors.toList());
 			if (Func.isNotEmpty(packageIds)) {
 				distributionParcelListService.update(new UpdateWrapper<DistributionParcelListEntity>().lambda()
 					.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())