修改

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

@@ -4429,7 +4429,7 @@
         WHERE TLFR.RESULT_OUT_GATE_TIME IS NULL AND TER.RESULT_ENTRY_GATE_TIME IS NOT NULL AND OO.CAPACITY_ID!=35128 AND OO . ORDER_TYPE= 1
         ) OO_EN ON OO_EN .ORDER_ID = OO .ORDER_ID
         WHERE
-         aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
@@ -4473,7 +4473,7 @@
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
@@ -4514,7 +4514,7 @@
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
@@ -4551,7 +4551,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 4
@@ -4589,7 +4589,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 4
@@ -4604,7 +4604,7 @@
         </if>
         GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
         ) T6 ON T0 ."target" = T6."target" AND T0."carrierName" = 	T6."carrierName"
-         JOIN
+        LEFT JOIN
         (
         --查询净重、理重
         SELECT
@@ -4779,7 +4779,7 @@
         WHERE TLFR.RESULT_OUT_GATE_TIME IS NULL AND TER .RESULT_ENTRY_GATE_TIME IS NOT NULL AND OO.CAPACITY_ID!=35128 AND OO . ORDER_TYPE= 1
         ) OO_EN ON OO_EN .ORDER_ID = OO .ORDER_ID
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 1
@@ -4818,7 +4818,7 @@
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
         WHERE
-         aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
@@ -4859,7 +4859,7 @@
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
@@ -4877,7 +4877,7 @@
         </if>
         GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
         ) T3 ON T1 ."target" = T3."target" AND T1."carrierName" = 	T3."carrierName"
-        JOIN
+        LEFT JOIN
         (
         --查询净重、理重
         SELECT
@@ -5039,7 +5039,7 @@
         WHERE QQR .RESULT_ID IS NULL AND OO.CAPACITY_ID!=35128 AND OO . ORDER_TYPE= 1
         ) OO_NOT_EN ON OO_NOT_EN .ORDER_ID = OO .ORDER_ID
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
@@ -5074,7 +5074,7 @@
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         and
         aso.SALE_ORDER_STATUS = 4
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
@@ -5112,7 +5112,7 @@
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 1
@@ -5144,7 +5144,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 4
@@ -5185,7 +5185,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 1
@@ -5220,7 +5220,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
         WHERE
-        aso.DELETED = 0
+        NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
         AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5,7)
         AND ASO.SALE_TYPE = 4

src/main/resources/log4j.properties

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