修改

pom.xml

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

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

@@ -6828,10 +6828,11 @@
             and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd'),'yyyy-mm-dd')
         </if>
         <if test="orderNoFlag == null">
-            and OO.ORDER_ID IS NOT NULL
+            AND ASM.SALE_MAKE_DATE IS NOT NULL
         </if>
         <if test="orderNoFlag != null">
-            and OO.ORDER_ID IS NULL
+            AND ASM.SALE_MAKE_DATE IS NULL
+            AND NVL(OO.CAPACITY_ID,0) != 35128
         </if>
         <if test="saleNo != null">
             and aso.sale_number like '%${saleNo}%'