修改bug2

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

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

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

@@ -1397,6 +1397,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	public void updateOrdersInfo(List<String> orderCodes, Long warehouseId) {
 
+		log.info(">>>>> T updateOrdersInfo start");
+
 		QueryWrapper<DistributionStockArticleEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.in("order_code", orderCodes)
 			.eq("warehouse_id", warehouseId)
@@ -1418,6 +1420,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 			//查询入库件数
 			updateStockArticleByextracted(warehouseId, stockArticleEntity);
+
+			log.info(">>>>> T updateOrdersInfo end");
 		}
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -1587,6 +1587,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 	@Override
 	public R downPackageAndDelTrayAndIsUpdate(List<UpShelfPackageDTO> upShelfPackageList, Long warehouseId, String remark, boolean isOrNo) {
+
+		log.info(">>>>> T downPackageAndDelTrayAndIsUpdate start");
 		int num = 0;
 		Set<String> orderSet = new TreeSet<>();
 
@@ -1612,6 +1614,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				.eq("association_value", orderPackageCode);
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
 			if (Objects.isNull(updownGoodsEntity)) {
+				// 有托盘 没有上架
 				log.warn("##############downPackage: 包件没有上架记录 orderPackageCode={}", orderPackageCode);
 				//判断是否有打托记录
 				QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsEntityQueryWrapper = new QueryWrapper<>();
@@ -1623,8 +1626,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 					//有托盘，托盘下托
 					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode, remark, warehouseId);
 				}
-				continue;
-			}
+			}else{
+				// 托盘存在上架
 				DistributionParcelListEntity parcelListEntity =parcelListEntitys.stream()
 					.filter(t -> t.getOrderPackageCode().equals(orderPackageCode))
 					.findFirst()
@@ -1644,7 +1647,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				taryAllocationEntityQueryWrapper.eq("allocation_id", allocationId)
 					.eq("is_deleted", 0);
 				WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper);
-//			BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId);
 				if (!Objects.isNull(taryAllocationEntity)) {
 					//有托盘，托盘下托
 					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode, remark, warehouseId);
@@ -1671,6 +1673,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
 			}
 
+		}
+
 //		for (String orderCode : orderSet) {
 //			distributionStockArticleClient.updateOrderInfo(orderCode, warehouseId);
 //		}
@@ -1680,6 +1684,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		orderPackageDTO1.setWarehouseId(warehouseId);
 		orderPackageDTO1.setStrings(orders);
 		distributionStockArticleClient.updateOrdersInfo(orderPackageDTO1);
+		log.info(">>>>> T downPackageAndDelTrayAndIsUpdate end");
 
 		return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
 	}