修改

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

@@ -360,19 +360,24 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                             String mobile = (String)messageMap.get("saleOrderConsigneeTEL");
                             tmstruckSmsRusultService.generaSendMessage(mobile,capacityNum,orderId);
                     }
-                    //销售厂外监控
-                    Map<String, Object> parem = getTruckFactoryResult(orderNumber);
-                    parem.put("turnOf","0");
-                    otmsFeign.createTotalResult(parem);
                     // 调用结算
-                    try {
-                        bmsTruckFeign.addDetailsOrder(orderId);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
                 }catch (Exception ex){
                     System.out.println(ex.getMessage());
                 }
+                //销售厂外监控
+                try {
+                    Map<String, Object> parem = getTruckFactoryResult(orderNumber);
+                    parem.put("turnOf","0");
+                    otmsFeign.createTotalResult(parem);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                try {
+                    System.out.println(orderId + "生成结算数据");
+                    bmsTruckFeign.addDetailsOrder(orderId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 break;
             case 2:
             case 3:

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

@@ -2380,6 +2380,8 @@
         "carrierName",
         OO.ORDER_NUMBER "orderNo",
         (CASE
+            WHEN BDO.DETAILS_ID IS NULL
+            THEN null
             WHEN ACTP.PRICE_VALUE IS NOT NULL
             THEN ROUND(ACTP.PRICE_VALUE,2)
             ELSE ROUND(ACTP2.PRICE_VALUE,2)