修改

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

@@ -177,7 +177,7 @@ public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultServi
     /**
      * 为已接收没有总实绩的运输订单补录总实绩
      */
-    //@Scheduled(fixedRate = 1000*60*5)
+    @Scheduled(fixedRate = 1000*60*5)
     public void insertTotalForNullOrder(){
         List<BigDecimal> list=tmstruckTotalResultMapper.getOrderForBulu();
         for(BigDecimal orderId:list){

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

@@ -3418,7 +3418,13 @@
         SELECT distinct OO.ORDER_ID "orderId",
         ASO.SALE_ORDER_ID "saleOrderId",
         to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
-        ASO.SALE_NUMBER "saleOrderNo",
+        (CASE
+            WHEN
+            ASM.SALE_NO is not null
+            then ASM.SALE_NO
+            else
+            ASO.SALE_NUMBER
+            end) "saleOrderNo",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
         ASM.MATERIAL_NUMBER "materialNum",
         ASM.MATERIAL_NUMBER "materialNumber",
@@ -3470,7 +3476,6 @@
         TWR.RESULT_TARE_WEIGHT       "tareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
         TWR.RESULT_NET_WEIGHT        "netWeight",
-        TLR.RESULT_LOAD_END_TIME     "loadTime",
         TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
         TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
         ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
@@ -3523,11 +3528,10 @@
         LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
         ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        AND TWR.MATERIAL_ID = RM.MATERIAL_ID
-        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
-        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        AND TLR.MATERIAL_ID = RM.MATERIAL_ID
+        ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
+--         LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+--         ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+--         AND TLR.MATERIAL_ID = RM.MATERIAL_ID
         LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         WHERE ASO.SALE_TYPE = 1
@@ -3537,7 +3541,8 @@
             AND TWR.RESULT_NET_WEIGHT IS NULL
             AND ASOM.SALE_DATE_OF_RECEIPT  < sysdate
             AND ASOM.SALE_DATE_OF_RECEIPT  > sysdate -1
-            AND ASO.INSERT_UPDATE_REMARK != '物流上传金蝶成功'
+            AND TLFR.RESULT_OUT_GATE_TIME IS NULL
+            AND NVL(ASO.INSERT_UPDATE_REMARK,'0') != '物流上传金蝶成功'
         </if>
         <if test="remark != null" >
             and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}

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

@@ -749,8 +749,8 @@
     </sql>
     <select id="getOrderForBulu" resultType="java.math.BigDecimal">
         SELECT OO .ORDER_ID FROM OMSTRUCK_ORDER OO
-                                     LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR .ORDER_ID = OO .ORDER_ID
-        WHERE TTR .RESULT_TOTAL_ID IS NULL and ORDER_STATUS=5
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR .ORDER_ID = OO .ORDER_ID
+        WHERE TTR .RESULT_TOTAL_ID IS NULL and OO.ORDER_STATUS=5
     </select>
     <select id="getLineId" resultType="java.util.Map">
         SELECT