修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-tms-truck-api</artifactId>
-    <version>1.8</version>
+    <version>1.9</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -2022,6 +2022,8 @@
                         THEN '已完成'
                         WHEN TTR.ORDER_STATUS IS NULL
                         THEN '未派发'
+                        WHEN OIR.SALE_MATERIAL_ID IS NOT NULL
+                        THEN '已入库'
                         ELSE TTR.ORDER_STATUS
                         END) "orderStatusActually",
                     QQR.RESULT_START_TIME   "queueStartTime",
@@ -2213,6 +2215,8 @@
                               ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                     LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
                     ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
+                    LEFT JOIN OYE_INBOUND_RESULT OIR
+                    ON OIR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
                     WHERE
                     ASM.SALE_MATERIAL_ID IS NOT NULL
                     and asm.SALE_ORDER_ID != -1
@@ -6502,6 +6506,8 @@
         (CASE WHEN
         OO.ORDER_STATUS = 2
         THEN '已完成'
+        WHEN OO.ORDER_STATUS = 2
+        THEN '已完成'
         WHEN TTR.ORDER_STATUS IS NULL
         THEN '未派发'
         WHEN TTR.ORDER_STATUS = '排队中' AND QQR.UPDATE_TIME IS NOT NULL