Merge remote-tracking branch 'origin/master'

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

@@ -1995,8 +1995,20 @@
                     TAR.INSERT_TIME "arrivalTime",
                     TRR.INSERT_TIME "receiptTime",
                     ASO.sale_remark "saleRemark",
-                    DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
-                    decode(TSR.RESULT_ID,null,'未发送','已发送')  "smsResultId",
+                    (CASE WHEN
+                        TLFR.RESULT_OUT_GATE_TIME IS NULL
+                        then null
+                        WHEN OO.PRINTNUMBER = 1
+                        then '已打印'
+                        else  '未打印'
+                        END)  "isPrintDelivery",
+                    (CASE WHEN
+                        TLFR.RESULT_OUT_GATE_TIME IS NULL
+                        then null
+                        WHEN TSR.RESULT_ID is null
+                        then '未发送'
+                        else  '已发送'
+                        END) "smsResultId",
                     (CASE WHEN
                         ASO.DELETED = 2 then '关闭'
                     when ASO.DELETED = 1 then '反审批'
@@ -2258,7 +2270,11 @@
         END)
         "carrierName",
         OO.ORDER_NUMBER "orderNo",
-        TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
+        (CASE
+            WHEN ACTP.PRICE_VALUE IS NOT NULL
+            THEN TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99')
+            ELSE TO_CHAR(ACTP2.PRICE_VALUE,'9999999990.99')
+        END) AS "priceValue",
         TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
         case
         when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
@@ -2368,6 +2384,8 @@
         ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
         ON actp.PRICE_ID = OO.PRICE_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp2
+        ON actp2.PRICE_ID = ASOM.PRICE_ID
         LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR
@@ -3213,7 +3231,6 @@
         ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         AND TLR.MATERIAL_ID = RM.MATERIAL_ID
         WHERE ASO.SALE_TYPE = 1
-        AND ASO.DELETED = 0
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>