refactor(WmsMaterialCoilService): 移除未发货和未计划钢卷的查询过滤逻辑
- 注释掉了 onlyUnshippedAndUnplanned 参数的处理代码 - 移除了未发货状态的过滤条件(排除状态=1) - 移除了发货计划绑定检查的 SQL 查询逻辑 - 移除了 NOT EXISTS 和 FIND_IN_SET 相关的复杂查询 - 保留了逻辑删除和团队字段的筛选功能
This commit is contained in:
@@ -552,16 +552,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
qw.in("mc.coil_id", coilIdList);
|
qw.in("mc.coil_id", coilIdList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 仅查询未发货且未绑定在发货计划里的钢卷
|
// // 仅查询未发货且未绑定在发货计划里的钢卷
|
||||||
if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) {
|
// if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) {
|
||||||
// 未发货:排除状态=1(已出库/已发货)
|
// // 未发货:排除状态=1(已出库/已发货)
|
||||||
qw.ne("mc.status", 1);
|
// qw.ne("mc.status", 1);
|
||||||
// 未绑定在任一有效发货计划:计划未删除,coil 字段包含当前 coil_id
|
// // 未绑定在任一有效发货计划:计划未删除,coil 字段包含当前 coil_id
|
||||||
// 这里使用 NOT EXISTS + FIND_IN_SET,避免将所有计划加载到内存
|
// // 这里使用 NOT EXISTS + FIND_IN_SET,避免将所有计划加载到内存
|
||||||
qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_plan dp " +
|
// qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_plan dp " +
|
||||||
"WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " +
|
// "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " +
|
||||||
"AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))");
|
// "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))");
|
||||||
}
|
// }
|
||||||
//逻辑删除
|
//逻辑删除
|
||||||
qw.eq("mc.del_flag", 0);
|
qw.eq("mc.del_flag", 0);
|
||||||
//把team字段作为筛选条件
|
//把team字段作为筛选条件
|
||||||
|
|||||||
Reference in New Issue
Block a user