|
|
@@ -26,7 +26,7 @@
|
|
|
order_remarks,
|
|
|
price_remarks,
|
|
|
customer_order_number,
|
|
|
- whole_order_total,
|
|
|
+ sum(b.total_price_and_tax) as whole_order_total,
|
|
|
end_customer,
|
|
|
term_of_payment,
|
|
|
order_change_description,
|
|
|
@@ -38,9 +38,7 @@
|
|
|
garment_nmb
|
|
|
FROM
|
|
|
sy_order_data a
|
|
|
- <if test="(sy.isProduct != null and sy.isProduct != '') or (sy.dilivery != null and sy.dilivery != '')">
|
|
|
left join sy_order_data_item b on a.id=b.sy_order_data_id
|
|
|
- </if>
|
|
|
WHERE 1=1
|
|
|
<if test="sy.orderNumber != null and sy.orderNumber !=''">
|
|
|
AND order_number = #{sy.orderNumber}
|
|
|
@@ -66,9 +64,7 @@
|
|
|
<if test="(sy.isProduct != null and sy.isProduct != '') and (sy.isProduct == '1' or sy.isProduct == 1) ">
|
|
|
AND b.inventory_code not like '19%'
|
|
|
</if>
|
|
|
- <if test="(sy.isProduct != null and sy.isProduct != '') or (sy.dilivery != null and sy.dilivery != '')">
|
|
|
GROUP BY a.id
|
|
|
- </if>
|
|
|
ORDER BY
|
|
|
order_date DESC
|
|
|
</select>
|
liuchaohui