|
@@ -973,7 +973,7 @@
|
|
|
<select id="getProdStorage" resultType="com.usoftchina.saas.document.dto.ProdStorageDTO">
|
|
<select id="getProdStorage" resultType="com.usoftchina.saas.document.dto.ProdStorageDTO">
|
|
|
SELECT * FROM (
|
|
SELECT * FROM (
|
|
|
SELECT pr_id prodId, pr_detail prodName, pr_code prodCode, pr_spec prodSpec, pr_unit prodUnit, pr_brand prodBrand,
|
|
SELECT pr_id prodId, pr_detail prodName, pr_code prodCode, pr_spec prodSpec, pr_unit prodUnit, pr_brand prodBrand,
|
|
|
- pr_orispeccode prodSpeccode,pr_leadtime prodLeadtime, 1 status, b2bStatus
|
|
|
|
|
|
|
+ pr_orispeccode prodOrispeccode,pr_leadtime prodLeadtime, 1 status, b2bStatus
|
|
|
FROM product
|
|
FROM product
|
|
|
<where>
|
|
<where>
|
|
|
<if test="userId != null">
|
|
<if test="userId != null">
|
|
@@ -985,7 +985,7 @@
|
|
|
</where>
|
|
</where>
|
|
|
union all
|
|
union all
|
|
|
SELECT pr_id prodId, pr_detail prodName, pr_code prodCode, pr_spec prodSpec, pr_unit prodUnit, pr_brand prodBrand,
|
|
SELECT pr_id prodId, pr_detail prodName, pr_code prodCode, pr_spec prodSpec, pr_unit prodUnit, pr_brand prodBrand,
|
|
|
- pr_orispeccode prodSpeccode,pr_leadtime prodLeadtime, 0 status, b2bStatus
|
|
|
|
|
|
|
+ pr_orispeccode prodOrispeccode,pr_leadtime prodLeadtime, 0 status, b2bStatus
|
|
|
FROM product
|
|
FROM product
|
|
|
<where>
|
|
<where>
|
|
|
<if test="userId != null">
|
|
<if test="userId != null">
|
chenw