Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -299,8 +299,10 @@ public class DataChange {
             }
         }else {
             //如果两者时间都为空，则查询当天和昨天数据
-            String yesDate = sdfDate.format(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24));
-            map.put("oneDate", yesDate + " 08:00:00");
+            //String yesDate = sdfDate.format(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24));
+            String nowDate = sdfDate.format(new Date());
+            map.put("oneDate", nowDate + " 08:00:00");
+
         }
     }
 }

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

@@ -1937,72 +1937,8 @@
                                                  2,'销售已提交',
                                                  4,'财务已审批',
                                                  0,'销售订单未上报') "saleOrderStatus",
-                    DECODE(OO.ORDER_STATUS || NVL(OO.ORDER_LINE_SEQUENCE, 0),
-                                                                 40,
-                                                                    '运单未接收',
-                                                                 50,
-                                                                    '运单已接收',
-                                                                 25,
-                                                                    '运单已完成',
-                                                                 28,
-                                                                    '运单已完成',
-                                                                 211,
-                                                                    '运单已完成',
-                                                                 214,
-                                                                    '运单已完成',
-                                                                 217,
-                                                                    '运单已完成',
-                                                                 220,
-                                                                    '运单已完成',
-                                                                 223,
-                                                                    '运单已完成',
-                                                                 226,
-                                                                    '运单已完成',
-                                                                 229,
-                                                                    '运单已完成',
-                                                                 232,
-                                                                    '运单已完成',
-                                                                 60,
-                                                                    '运单被拒绝',
-                                                                 70,
-                                                                    '运单已关闭',
-                                                                 71,
-                                                                    '运单已关闭',
-                                                                 72,
-                                                                    '运单已关闭',
-                                                                 73,
-                                                                    '运单已关闭',
-                                                                 74,
-                                                                    '运单已关闭',
-                                                                 75,
-                                                                    '运单已关闭',
-                                                                 76,
-                                                                    '运单已关闭',
-                                                                 77,
-                                                                    '运单已关闭',
-                                                                 78,
-                                                                    '运单已关闭',
-                                                                 79,
-                                                                    '运单已关闭',
-                                                                 710,
-                                                                    '运单已关闭',
-                                                                 711,
-                                                                    '运单已关闭',
-                                                                 712,
-                                                                    '运单已关闭',
-                                                                 80,
-                                                                    '运单已关闭',
-                                                                 81,
-                                                                    '运单已关闭',
-                                                                 82,
-                                                                    '运单已关闭',
-                                                                 83,
-                                                                    '运单已关闭',
-                                                                 60,
-                                                                    '运单被拒绝',
-                                                                 0,
-                                                                    '运单未派发',
-                                                                    '运单作业中') "orderStatus"
+                    DECODE(OO.ORDER_STATUS ,2,'已完成',4,'已派发',5,'已接收',0,'未派发',7,'已关闭',8,'已关闭')
+                                                                  "orderStatus"
                     FROM AMS_SALE_ORDER ASO
                     LEFT JOIN RMS_CONSIGNEE RC
                               ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
@@ -2048,6 +1984,7 @@
                               ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                     WHERE ASO.SALE_TYPE = 1
                           AND ASO.DELETED = 0
+                          and ASM.SALE_MATERIAL_ID IS NOT NULL
                     <if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.SALE_DATE_OF_RECEIPT
                     </if>