fix(wms): 修复钢卷查询中删除标记关联查询问题
- 将内连接改为左连接以正确处理删除标记的数据关联 - 删除了关于绑定信息排序逻辑的冗余注释 - 确保查询结果包含被标记删除的运单和计划数据的关联信息
This commit is contained in:
@@ -630,7 +630,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
qw.apply("COALESCE(ca.abnormal_count, 0) >= {0}", bo.getMinAbnormalCount());
|
||||
}
|
||||
// 排序:
|
||||
// - 当前端需要绑定信息(includeBindInfo=true)时:优先展示“已绑定实际库位”的钢卷(actual_warehouse_id 非空在前)
|
||||
// 再按实际库位ID升序(库位ID为自增,升序即可满足“先生成的库位在前”)
|
||||
// - 否则:保持原有创建时间倒序
|
||||
if (Boolean.TRUE.equals(bo.getOrderBy())) {
|
||||
|
||||
@@ -85,8 +85,8 @@
|
||||
d.settlement_type,
|
||||
d.unit_price
|
||||
FROM wms_delivery_waybill_detail d
|
||||
INNER JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
|
||||
INNER JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0
|
||||
LEFT JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0
|
||||
LEFT JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0
|
||||
WHERE d.del_flag = 0
|
||||
AND d.coil_id IN
|
||||
<foreach collection="coilIds" item="id" open="(" close=")" separator=",">
|
||||
|
||||
Reference in New Issue
Block a user