|
@@ -684,15 +684,14 @@
|
|
|
kdm.cost_price,
|
|
|
s.stock_qty as balanceNumber,
|
|
|
s.stock_id,
|
|
|
- scp.correspond_id,
|
|
|
+ sc.id as correspondId,
|
|
|
sc.name as correspondName,
|
|
|
kdm.category_name
|
|
|
FROM
|
|
|
stock s
|
|
|
- JOIN stock_correspond_position scp on scp.stock_id = s.stock_id
|
|
|
JOIN king_dee_material kdm ON s.material_id = kdm.id
|
|
|
- JOIN stock_correspond sc on scp.correspond_id = sc.id
|
|
|
- left join admin_user_stock aus on scp.correspond_id = aus.correspond_id
|
|
|
+ JOIN stock_correspond sc on s.stock_id = sc.id
|
|
|
+ left join admin_user_stock aus on sc.id = aus.correspond_id
|
|
|
${ex.query}
|
|
|
and scp.stock_id = s.stock_id
|
|
|
<if test="adminUserId != null and adminUserId!=''">
|