耗材记录接口修改
This commit is contained in:
@@ -128,4 +128,6 @@ public class ConsStockFlowDTO implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
private String vendorName;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,8 +61,10 @@
|
|||||||
</foreach>
|
</foreach>
|
||||||
</select>
|
</select>
|
||||||
<select id="findConsStockFlowPage" resultType="com.czg.product.dto.ConsStockFlowDTO">
|
<select id="findConsStockFlowPage" resultType="com.czg.product.dto.ConsStockFlowDTO">
|
||||||
select a.*, b.name as productName from tb_cons_stock_flow as a
|
select a.*, b.name as productName, c.`name` as vendorName from tb_cons_stock_flow as a
|
||||||
|
left join tb_shop_vendor as c on c.id=a.vendor_id
|
||||||
left join tb_product as b on a.product_id = b.id
|
left join tb_product as b on a.product_id = b.id
|
||||||
|
|
||||||
where a.shop_id=#{shopId}
|
where a.shop_id=#{shopId}
|
||||||
<if test="inOutType != null and inOutType != ''">
|
<if test="inOutType != null and inOutType != ''">
|
||||||
and a.in_out_type = #{inOutType}
|
and a.in_out_type = #{inOutType}
|
||||||
|
|||||||
Reference in New Issue
Block a user