修改

pom.xml

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

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

@@ -861,6 +861,9 @@
            LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = OIR.SALE_MATERIAL_ID
            LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB ON TWB.WEIGHT_BATCH_ID = ASM.WEIGHT_BATCH_ID
            <where>
+           <if test="1 == 1">
+             and  OIR.SALE_MATERIAL_ID IS NOT NULL
+           </if>
            <if test="startDate != null">
               and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OIR.INSERT_TIME
               and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OIR.INSERT_TIME

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

@@ -831,6 +831,9 @@
     LEFT JOIN RMS_CONSIGNEE RC on OOR.CONSIGNEE_ID = RC.CONSIGNEE_ID
     LEFT JOIN OMSTRUCK_ORDER OO on OOR.ORDER_ID = OO.ORDER_ID
     <where>
+        <if test="1 == 1">
+          and  OOR.SALE_MATERIAL_ID IS NOT NULL
+        </if>
       <if test="startDate != null">
         and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OOR.INSERT_TIME
         and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OOR.INSERT_TIME

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

@@ -695,6 +695,9 @@
     LEFT JOIN RMS_MATERIAL RM on ORI.MATERIAL_ID = RM.MATERIAL_ID
     LEFT JOIN RMS_CONSIGNEE RC on ORI.CONSIGNEE_ID = RC.CONSIGNEE_ID
     <where>
+      <if test="1 == 1">
+        and  NVL(ORI.MATERIAL_NUMBER,0) > 0
+      </if>
       <if test="startDate != null">
         and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ORI.INSERT_TIME
         and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= ORI.INSERT_TIME
@@ -820,6 +823,8 @@
     NVL(ORI.MATERIAL_NUMBER,0) "materialNumber",
     NVL(ORI.THEORY_WEIGHT,0) "materialWeight"
     FROM
+    OYE_REALTIME_INVENTORY ORI
+    LEFT JOIN
     (
     SELECT
     oir.INVENTORY_ID "INVENTORY_ID",
@@ -828,9 +833,10 @@
     FROM
     OYE_REALTIME_INVENTORY ORI
     LEFT JOIN OYE_INBOUND_RESULT OIR ON OIR.INVENTORY_ID = ORI.INVENTORY_ID
+    WHERE  OIR.SALE_MATERIAL_ID IS NOT NULL
     GROUP BY
     oir.INVENTORY_ID
-    ) T1
+    ) T1 ON T1.INVENTORY_ID = ORI.INVENTORY_ID
     LEFT JOIN (
     SELECT
     oor.INVENTORY_ID "INVENTORY_ID",
@@ -839,10 +845,10 @@
     FROM
     OYE_REALTIME_INVENTORY ORI
     LEFT JOIN OYE_OutBOUND_RESULT OOR ON OOR.INVENTORY_ID = ORI.INVENTORY_ID
+    WHERE OOR.SALE_MATERIAL_ID IS NOT NULL
     GROUP BY
     oor.INVENTORY_ID
-    ) T2 ON T2.INVENTORY_ID = T1.INVENTORY_ID
-    LEFT JOIN OYE_REALTIME_INVENTORY ORI ON ORI.INVENTORY_ID = T1."INVENTORY_ID"
+    ) T2 ON T2.INVENTORY_ID = ORI.INVENTORY_ID
     LEFT JOIN (
     SELECT
     OIR.INVENTORY_ID "INVENTORY_ID",
@@ -851,16 +857,17 @@
     FROM
     OYE_INBOUND_RESULT OIR
     WHERE
+    OIR.SALE_MATERIAL_ID IS NOT NULL
     <if test="oneDate != null">
-      to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = OIR.INSERT_TIME
+      AND to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = OIR.INSERT_TIME
     </if>
     <if test="startDate != null">
-      to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OIR.INSERT_TIME
+      AND to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OIR.INSERT_TIME
       and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OIR.INSERT_TIME
     </if>
     GROUP BY
     OIR.INVENTORY_ID
-    ) T3 ON T3."INVENTORY_ID" = T1."INVENTORY_ID"
+    ) T3 ON T3."INVENTORY_ID" = ORI."INVENTORY_ID"
     LEFT JOIN (
     SELECT
     OOR.INVENTORY_ID "INVENTORY_ID",
@@ -869,16 +876,17 @@
     FROM
     OYE_OUTBOUND_RESULT OOR
     WHERE
+    OOR.SALE_MATERIAL_ID IS NOT NULL
     <if test="oneDate != null">
       AND to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = OOR.INSERT_TIME
     </if>
     <if test="startDate != null">
-      to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OOR.INSERT_TIME
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OOR.INSERT_TIME
       and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OOR.INSERT_TIME
     </if>
     GROUP BY
     OOR.INVENTORY_ID
-    ) T4 ON T4."INVENTORY_ID" = T1."INVENTORY_ID"
+    ) T4 ON T4."INVENTORY_ID" = ORI."INVENTORY_ID"
     LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ORI.CONSIGNEE_ID
     LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ORI.MATERIAL_ID
     <where>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout