Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -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
@@ -2458,6 +2458,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>
@@ -2493,8 +2499,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