|
|
@@ -472,7 +472,7 @@
|
|
|
<result column="pr_detail" property="rc_prodDetail" jdbcType="VARCHAR" />
|
|
|
<result column="pr_unit" property="rc_prodUnit" jdbcType="VARCHAR" />
|
|
|
<result column="wh_code" property="rc_whCode" jdbcType="VARCHAR" />
|
|
|
- <result column="wh_name" property="rc_whName" jdbcType="VARCHAR" />
|
|
|
+ <result column="wh_description" property="rc_whName" jdbcType="VARCHAR" />
|
|
|
<result column="pw_onhand" property="rc_number" jdbcType="DOUBLE" />
|
|
|
<result column="pw_avprice" property="rc_price" jdbcType="DOUBLE" />
|
|
|
<result column="pw_amount" property="rc_amount" jdbcType="DOUBLE" />
|
|
|
@@ -485,6 +485,7 @@
|
|
|
</if>
|
|
|
<if test="companyId!=null">
|
|
|
and tab.companyId=#{companyId} and Product.companyId=#{companyId} and warehouse.companyId=#{companyId}
|
|
|
+ and pw_onhand!=0
|
|
|
</if>
|
|
|
</where>
|
|
|
ORDER BY PR_ID DESC
|