|
@@ -1514,7 +1514,6 @@
|
|
GROUP BY xxsoi.sales_id
|
|
GROUP BY xxsoi.sales_id
|
|
)xxnewsoi ON tt.sales_id = xxnewsoi.sales_id
|
|
)xxnewsoi ON tt.sales_id = xxnewsoi.sales_id
|
|
<where>
|
|
<where>
|
|
- sales_status != 3
|
|
|
|
<if test="salesShippingStatus !=null">
|
|
<if test="salesShippingStatus !=null">
|
|
AND tt.sales_shipping_status = #{salesShippingStatus}
|
|
AND tt.sales_shipping_status = #{salesShippingStatus}
|
|
</if>
|
|
</if>
|
|
@@ -1810,7 +1809,6 @@
|
|
LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
|
|
LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
|
|
LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
|
|
LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
|
|
<where>
|
|
<where>
|
|
- sales_status != 3
|
|
|
|
<if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
|
|
<if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">
|
|
AND sales_batch_id != 'KS00000000000001'
|
|
AND sales_batch_id != 'KS00000000000001'
|
|
</if>
|
|
</if>
|