|
|
@@ -463,9 +463,11 @@
|
|
|
<result column="onhand" property="rc_number" jdbcType="DOUBLE"/>
|
|
|
<result column="po_avprice" property="rc_price" jdbcType="DOUBLE"/>
|
|
|
<result column="po_amount" property="rc_amount" jdbcType="DOUBLE"/>
|
|
|
+ <result column="pr_brand" property="rc_prodBrand" jdbcType="VARCHAR"/>
|
|
|
+ <result column="pr_orispeccode" property="rc_prodOrispec" jdbcType="VARCHAR"/>
|
|
|
</resultMap>
|
|
|
<select id="selectReserveCost" resultMap="ProdReserveCostResultMap">
|
|
|
- select pr_code,pr_spec,pr_detail,pr_unit,wh_code,wh_description,pw_onhand onhand
|
|
|
+ select pr_code,pr_spec,pr_detail,pr_unit,wh_code,wh_description,pw_onhand onhand,pr_brand,pr_orispeccode
|
|
|
from productWH left join Product on pw_prodid=pr_id left join warehouse on pw_whid=wh_id
|
|
|
<where>
|
|
|
<if test="con!=null">
|
|
|
@@ -479,7 +481,7 @@
|
|
|
ORDER BY PR_ID DESC
|
|
|
</select>
|
|
|
<select id="selectReserveCostByIgnoreWarehouse" resultMap="ProdReserveCostResultMap">
|
|
|
- select pr_code,pr_spec,pr_detail,pr_unit,po_onhand onhand,po_avprice,po_amount
|
|
|
+ select pr_code,pr_spec,pr_detail,pr_unit,po_onhand onhand,po_avprice,po_amount,pr_brand,pr_orispeccode
|
|
|
from productonhand left join product on pr_id = po_prodid and productonhand.companyId = product.companyId
|
|
|
<where>
|
|
|
<if test="con!=null">
|