修改

pom.xml

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

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

@@ -6506,14 +6506,29 @@
         (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
         THEN '已放行'
+        WHEN OOR.INVENTORY_ID IS NOT NULL
+        THEN '已出库'
+        WHEN OOR.INVENTORY_ID IS NULL
+        THEN TTR.ORDER_STATUS
         ELSE TTR.ORDER_STATUS
         END) "orderStatusActually",
+        (CASE WHEN
+        OO.ORDER_STATUS = 2
+        THEN '已完成'
+        WHEN TTR.ORDER_STATUS IS NULL
+        THEN '未派发'
+        WHEN TTR.ORDER_STATUS = '排队中' AND QQR.UPDATE_TIME IS NOT NULL
+        THEN '已放行'
+        WHEN OOR.INVENTORY_ID IS NOT NULL
+        THEN '已出库'
+        WHEN OOR.INVENTORY_ID IS NULL
+        THEN TTR.ORDER_STATUS
+        ELSE TTR.ORDER_STATUS
+        END)  "orderStatus",
         QQR.RESULT_START_TIME   "queueStartTime",
         QQR.UPDATE_TIME         "allowEnfactoryTime",
         TWB .WEIGHT_BATCH_ID "weightBatchId",
@@ -6550,15 +6565,6 @@
         when ASO.SALE_ORDER_STATUS = 0 then '待审核'
         END
         ) "saleOrderStatus",
-        (CASE WHEN
-        OO.ORDER_STATUS = 2
-        THEN '已完成'
-        WHEN TTR.ORDER_STATUS IS NULL
-        THEN '未派发'
-        WHEN TTR.ORDER_STATUS = '排队中' AND QQR.UPDATE_TIME IS NOT NULL
-        THEN '已放行'
-        ELSE TTR.ORDER_STATUS
-        END)  "orderStatus",
         (SELECT count(asm.SALE_MATERIAL_ID)  FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID