修改

pom.xml

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

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

@@ -6504,6 +6504,8 @@
         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) "orderStatusActually",
         QQR.RESULT_START_TIME   "queueStartTime",
@@ -6724,23 +6726,14 @@
         </if>
         <if test="orderStatusList != null and orderStatusList.size > 0">
             and <foreach collection="orderStatusList" item="item" open="(" separator="or" close=")">
-            (CASE
-            when OO.ORDER_STATUS =2
-            then '已完成'
-            when OO.ORDER_STATUS=4
-            then '已派单'
-            when nvl(OO.ORDER_STATUS,0)=0
-            then '未派发'
-            when OO.ORDER_STATUS=7
-            then '已关闭'
-            when OO.ORDER_STATUS=8
-            then '已关闭'
-            WHEN TRR.INSERT_TIME IS NOT NULL
+            (CASE WHEN
+            OO.ORDER_STATUS = 2
             THEN '已完成'
-            WHEN QQR.RESULT_START_TIME IS NOT NULL
-            THEN '排队中'
-            when OO.ORDER_STATUS=5
-            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) like '%${item}%'
         </foreach>
         </if>
@@ -6751,6 +6744,8 @@
             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) like '%${item}%'
         </foreach>
@@ -6790,6 +6785,7 @@
             or  ASO.SALE_ORDER_RECEIVE_CUSTOMER LIKE '%${consigneeLoginName}%')
         </if>
         and ASO.DELETED = 0
+        AND ASM.DELETED IS NULL
         and ASO.SALE_TYPE = 50
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd'),'yyyy-mm-dd')
@@ -6926,6 +6922,7 @@
             TWB.WEIGHT_BATCH_ID  "netWeight",
             oo.ORDER_NUMBER             "orderNo",
             ORI.INBOUND_WAREHOUSE   "inventoryWarehouse",
+            ORI.INBOUND_WAREHOUSE   "inboundWarehouse",
             ORI.MATERIAL_NUMBER "inventoryMaterialNumber",
             ORI.THEORY_WEIGHT   "inventoryTheoryWeight",
             ORI.SINGLE_WEIGHT   "singleWeight",