refactor(WmsAnnealPerformance): 优化退火性能查询的过滤逻辑
- 移除 mapper 中废弃的钢卷号过滤条件和库区筛选参数 - 简化 SQL 查询中的条件判断逻辑 - 统一服务层中的空值检查方法 - 优化查询性能并减少不必要的 JOIN 操作
This commit is contained in:
@@ -144,17 +144,17 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
|
||||
continue; // 没找到加工后的卷,跳过
|
||||
}
|
||||
|
||||
// 如果传入了筛选条件,只保留匹配的钢卷
|
||||
if (bo.getEnterCoilNo() != null && !bo.getEnterCoilNo().isEmpty()) {
|
||||
// 筛选加工后的钢卷
|
||||
if (StringUtils.isNotBlank(bo.getEnterCoilNo())) {
|
||||
if (coilVo.getEnterCoilNo() == null ||
|
||||
!coilVo.getEnterCoilNo().contains(bo.getEnterCoilNo())) {
|
||||
continue; // 跳过不匹配的钢卷
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (bo.getCurrentCoilNo() != null && !bo.getCurrentCoilNo().isEmpty()) {
|
||||
if (StringUtils.isNotBlank(bo.getCurrentCoilNo())) {
|
||||
if (coilVo.getCurrentCoilNo() == null ||
|
||||
!coilVo.getCurrentCoilNo().contains(bo.getCurrentCoilNo())) {
|
||||
continue; // 跳过不匹配的钢卷
|
||||
continue;
|
||||
}
|
||||
}
|
||||
// 钢卷本身的逻辑库区筛选(coilVo.warehouseId保持不变)
|
||||
@@ -164,7 +164,6 @@ public class WmsAnnealPerformanceServiceImpl implements IWmsAnnealPerformanceSer
|
||||
continue; // 跳过不匹配的钢卷
|
||||
}
|
||||
}
|
||||
|
||||
// 为每个planCoil创建独立的detail,携带自身的logicWarehouseId/furnaceLevel
|
||||
WmsAnnealPerformanceDetailVo coilDetail = new WmsAnnealPerformanceDetailVo();
|
||||
coilDetail.setPlanId(detail.getPlanId());
|
||||
|
||||
Reference in New Issue
Block a user