PDA托盘数量维护

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-tjj";
 
 	/**
 	 * 工厂对接服务名称

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

@@ -2659,9 +2659,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				int trayNum = 0;
 				if (Func.isNotEmpty(distributionParcelListEntities)) {
 					List<String> packageCodeList = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.toList());
-					List<WarehouseTrayGoodsEntity> collect = trayList.stream().distinct().collect(Collectors.toList());
+//					List<WarehouseTrayGoodsEntity> collect = trayList.stream().distinct().collect(Collectors.toList());
-					for (WarehouseTrayGoodsEntity warehouseTrayGoodsEntity : collect) {
+					List<Long> trayIds = trayList.stream().map(WarehouseTrayGoodsEntity::getTrayId).distinct().collect(Collectors.toList());
-						List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(warehouseTrayGoodsEntity.getTrayId().toString(), warehouseTrayGoodsEntity.getTrayCode());
+					for (Long trayId : trayIds) {
+						List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(trayId.toString(), "");
 						//判断该托盘上的货物都存在于计划之中
 						boolean isLoadingTrayFlag = trayIdList.stream().map(WarehouseTrayGoodsEntity::getAssociationValue).allMatch(t -> packageCodeList.contains(t));
 						if (isLoadingTrayFlag) {