luobang 2 年之前
父节点
当前提交
ea873d997f

+ 0 - 4
src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -252,10 +252,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         i += utilsService.updateOrderLineSequence(map);
         i += utilsService.updateOrderLineSequence(map);
         switch (orderType){
         switch (orderType){
             case 1:
             case 1:
-                Integer driverConfirmationSteel = utilsMapper.getDriverConfirmation(orderId);
-                if(driverConfirmationSteel == null){
-                    throw new Exception("请提醒司机确认订单!");
-                }
                 //判断该订单是不是自提
                 //判断该订单是不是自提
                 String isSelfMention = tmstruckLeaveFactoryResultMapper.getIsSelfMention(orderId);
                 String isSelfMention = tmstruckLeaveFactoryResultMapper.getIsSelfMention(orderId);
                 try {
                 try {

+ 3 - 3
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1963,9 +1963,9 @@
                                                  0,'未上报') "saleOrderStatus",
                                                  0,'未上报') "saleOrderStatus",
                     (CASE
                     (CASE
                     when OO.ORDER_STATUS =2
                     when OO.ORDER_STATUS =2
-                    then '作业已完成'
+                    then '已完成'
                     when OO.ORDER_STATUS=4
                     when OO.ORDER_STATUS=4
-                    then '物流公司已派单'
+                    then '已派单'
                     when nvl(OO.ORDER_STATUS,0)=0
                     when nvl(OO.ORDER_STATUS,0)=0
                     then '未派发'
                     then '未派发'
                     when OO.ORDER_STATUS=7
                     when OO.ORDER_STATUS=7
@@ -1981,7 +1981,7 @@
                     WHEN QQR.RESULT_START_TIME IS NOT NULL
                     WHEN QQR.RESULT_START_TIME IS NOT NULL
                     THEN '排队中'
                     THEN '排队中'
                     when OO.ORDER_STATUS=5
                     when OO.ORDER_STATUS=5
-                    then '司机已接单'
+                    then '已接单'
                     WHEN TER.INSERT_TIME IS NULL
                     WHEN TER.INSERT_TIME IS NULL
                     THEN ' '
                     THEN ' '
                     WHEN TLFR.INSERT_TIME IS NULL THEN ' '
                     WHEN TLFR.INSERT_TIME IS NULL THEN ' '