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

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -243,10 +243,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult(orderNumber);
                     parem.put("turnOf","0");
                     otmsFeign.createTotalResult(parem);
+                    // 调用结算
+                    bmsTruckFeign.addDetailsOrder(orderId);
                 }catch (Exception ex){
 
                 }
-//                bmsTruckFeign.addDetailsOrder(orderId);
                 break;
             case 2:
             case 3:

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

@@ -2031,7 +2031,6 @@
                               ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                     WHERE ASO.SALE_TYPE = 1
                           AND ASO.DELETED = 0
-                          AND ASM.DELETED IS NULL
                     <if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.SALE_DATE_OF_RECEIPT
                     </if>