|
@@ -520,8 +520,8 @@
|
|
) as saleNum
|
|
) as saleNum
|
|
FROM
|
|
FROM
|
|
warehouse_base_info wbi
|
|
warehouse_base_info wbi
|
|
- LEFT JOIN warehouse_position_info wpi ON wpi.base_id = wbi.id
|
|
|
|
- LEFT JOIN warehouse_position_storage_info wpsi ON wpsi.position_id = wpi.id
|
|
|
|
|
|
+ LEFT JOIN warehouse_position_info wpi ON wpi.base_id = wbi.id and wpi.delete_flag = 0
|
|
|
|
+ LEFT JOIN warehouse_position_storage_info wpsi ON wpsi.position_id = wpi.id and wpsi.delete_flag = 0
|
|
WHERE
|
|
WHERE
|
|
1 = 1
|
|
1 = 1
|
|
<if test="compId != null and compId != ''">
|
|
<if test="compId != null and compId != ''">
|
|
@@ -540,8 +540,8 @@
|
|
sum( wpsi.storage ) as stockNum
|
|
sum( wpsi.storage ) as stockNum
|
|
FROM
|
|
FROM
|
|
warehouse_base_info wbi
|
|
warehouse_base_info wbi
|
|
- LEFT JOIN warehouse_position_info wpi ON wpi.base_id = wbi.id
|
|
|
|
- LEFT JOIN warehouse_position_storage_info wpsi ON wpsi.position_id = wpi.id
|
|
|
|
|
|
+ LEFT JOIN warehouse_position_info wpi ON wpi.base_id = wbi.id and wpi.delete_flag = 0
|
|
|
|
+ LEFT JOIN warehouse_position_storage_info wpsi ON wpsi.position_id = wpi.id and wpsi.delete_flag = 0
|
|
WHERE
|
|
WHERE
|
|
wpsi.id IS NOT NULL
|
|
wpsi.id IS NOT NULL
|
|
<if test="compId != null and compId != ''">
|
|
<if test="compId != null and compId != ''">
|