|
@@ -864,6 +864,8 @@
|
|
|
group by kdm.id
|
|
|
</select>
|
|
|
<select id="listStockToCostPriceV2" resultType="com.zfire.mall.manager.bean.stock.StockBeanToCostPrice">
|
|
|
+
|
|
|
+
|
|
|
SELECT
|
|
|
kdm.`name` as materialName,
|
|
|
kdm.old_number as materialOldNumber,
|
|
@@ -873,16 +875,17 @@
|
|
|
kdm.cost_price,
|
|
|
s.stock_qty as balanceNumber,
|
|
|
s.stock_id,
|
|
|
- sc.id as correspond_id,
|
|
|
+ scp.correspond_id,
|
|
|
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 s.stock_id = sc.id
|
|
|
- left join admin_user_stock aus on sc.id = aus.correspond_id
|
|
|
+ JOIN stock_correspond sc on scp.correspond_id = sc.id
|
|
|
+ left join admin_user_stock aus on scp.correspond_id = aus.correspond_id
|
|
|
${ex.query}
|
|
|
- and sc.id = s.stock_id
|
|
|
+ and scp.stock_id = s.stock_id
|
|
|
<if test="adminUserId != null and adminUserId!=''">
|
|
|
and aus.admin_user_id = #{adminUserId}
|
|
|
</if>
|