|
|
@@ -2228,8 +2228,8 @@
|
|
|
END)
|
|
|
"carrierName",
|
|
|
OO.ORDER_NUMBER "orderNo",
|
|
|
- ACTP.PRICE_VALUE AS "priceValue",
|
|
|
- BDO.DETAILS_AMOUNT "detailsAmount",
|
|
|
+ TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
|
|
|
+ TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
|
|
|
case
|
|
|
when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
|
|
|
then (select RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
|
|
|
@@ -2439,6 +2439,12 @@
|
|
|
0,'未上报') like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
+ <if test="saleOrderMaterialIds != null">
|
|
|
+ and ASOM.SALE_ORDER_MATERIAL_ID IN
|
|
|
+ <foreach collection="saleOrderMaterialIds" item="item" open="(" separator="," close=")">
|
|
|
+ '${item}'
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID DESC
|
|
|
)
|
|
|
</select>
|
|
|
@@ -2474,8 +2480,8 @@
|
|
|
END)
|
|
|
"carrierName",
|
|
|
OO.ORDER_NUMBER "orderNo",
|
|
|
- ACTP.PRICE_VALUE AS "priceValue",
|
|
|
- BDO.DETAILS_AMOUNT "detailsAmount",
|
|
|
+ TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
|
|
|
+ TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
|
|
|
RRP.PLACE_ID "placeId",
|
