修改

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

@@ -4227,7 +4227,12 @@
         FROM
         (SELECT DISTINCT
         ASM.TRANSFER_OUT_OF_WAREHOUSE "target",
-        RC.CARRIER_ABBREVIATION "carrierName"
+        (Case when
+        ASO.SALE_TYPE = 4
+        THEN '车皮'
+        else
+        RC.CARRIER_ABBREVIATION
+        end) "carrierName"
         FROM
         AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4238,26 +4243,39 @@
         WHERE
         ASM.TRANSFER_OUT_OF_WAREHOUSE IS NOT NULL
         AND RC.CARRIER_ABBREVIATION IS NOT NULL
-        AND ASO.SALE_ORDER_ISSELF_MENTION = '否'
+        AND ASO.SALE_ORDER_ISSELF_MENTION != '是'
         and to_date(#{startDate}, 'yyyy-mm-dd') <=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
         and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-2,'yyyy-mm-dd'),'yyyy-mm-dd')
-        AND ASO.SALE_TYPE = 1) T0
+        AND ASO.SALE_TYPE in (1,4)) T0
         LEFT JOIN
         (
         SELECT
         ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
-        RC.CARRIER_ABBREVIATION "carrierName",--承运商
-        COUNT(DISTINCT ASOM.SALE_ORDER_MATERIAL_ID) "planNum",--计划总数
-        COUNT(DISTINCT OO .ORDER_ID) "orderNum",--运单总数
+        (Case when
+            ASO.SALE_TYPE = 4
+            THEN '车皮'
+            else
+            RC.CARRIER_ABBREVIATION
+            end)     "carrierName",--承运商
+        COUNT(DISTINCT CASE WHEN
+            ASO.SALE_TYPE = 1
+            THEN
+            ASOM.SALE_ORDER_MATERIAL_ID
+            ELSE null
+            END) "planNum",--计划总数
+        COUNT(DISTINCT CASE WHEN
+            ASO.SALE_TYPE = 1
+            THEN
+            OO .ORDER_ID
+            ELSE null
+            END) "orderNum",--运单总数
         COUNT(DISTINCT OO_QUXIAO .ORDER_ID) "quxiaoNum",--取消运单数
         COUNT(DISTINCT OO_NOT_EN .ORDER_ID) "notEnNum",--未进场数量
         COUNT(DISTINCT OO_ENFACTORY.ORDER_ID) "enFactoryNum",--已进厂数量
         COUNT(DISTINCT OO_QUEUE.ORDER_ID) "queueNum",--排队中数量
         COUNT(DISTINCT OO_RECEIVED.ORDER_ID) "receivedNum",--已接单数量
         COUNT(DISTINCT OO_UN_RECEIVE.ORDER_ID) "unReceiveNum",--未接收数量
-        COUNT(DISTINCT OO_EN .ORDER_ID) "EnNum",--进场待装数量
-        SUM(TWR.RESULT_NET_WEIGHT) "totalNet",--总净重
-        SUM(ASM.MATERIAL_WEIGHT) "materialThoWeight"
+        COUNT(DISTINCT OO_EN .ORDER_ID) "EnNum" --进场待装数量
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -4341,8 +4359,8 @@
         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)
-        AND ASO.SALE_TYPE = 1
-        AND ASO.SALE_ORDER_ISSELF_MENTION='否'
+        AND ASO.SALE_TYPE in (1,4)
+        AND ASO.SALE_ORDER_ISSELF_MENTION !='是'
         AND ASM.SALE_MATERIAL_ID IS NOT NULL
         and ASM.SALE_ORDER_ID != -1
         <if test="startDate != null">
@@ -4351,7 +4369,12 @@
             AND (NVL(ASOM.WARRANTY_NUMBER,0) = 0
             or (NVL(ASOM.WARRANTY_NUMBER,0) = 1 and asom.PREVIOUS_ORDER_NUMBER is null))
         </if>
-        GROUP BY ASM .TRANSFER_OUT_OF_WAREHOUSE,RC.CARRIER_ABBREVIATION
+        GROUP BY ASM .TRANSFER_OUT_OF_WAREHOUSE,Case when
+        ASO.SALE_TYPE = 4
+        THEN '车皮'
+        else
+        RC.CARRIER_ABBREVIATION
+        end
         ) T1 ON T0."target" = T1."target" AND T1."carrierName" = T0."carrierName"
         LEFT JOIN
         (
@@ -4439,8 +4462,8 @@
         (
         --查询车皮
         SELECT
-        '钢材工程组' "target",--方向
-        '达运' "carrierName",--承运商
+        ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
+        '车皮' "carrierName",--承运商
         SUM( TWR.RESULT_NET_WEIGHT) "trainWeight"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
@@ -4473,8 +4496,8 @@
         (
         --查询车皮理重
         SELECT
-        '钢材工程组' "target",--方向
-        '达运' "carrierName",--承运商
+        ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
+        '车皮' "carrierName",--承运商
         SUM( CASE WHEN
         TWR.RESULT_NET_WEIGHT IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
@@ -4506,14 +4529,24 @@
             or (NVL(ASOM.WARRANTY_NUMBER,0) = 1 and asom.PREVIOUS_ORDER_NUMBER is null))
         </if>
         GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
-        ) T6 ON T1 ."target" = T6."target" AND T1."carrierName" = 	T6."carrierName"
+        ) T6 ON T0 ."target" = T6."target" AND T0."carrierName" = 	T6."carrierName"
          JOIN
         (
         --查询净重、理重
         SELECT
         ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
-        RC.CARRIER_ABBREVIATION "carrierName",--承运商
-        SUM( TWR.RESULT_NET_WEIGHT) "truckNetWeight",
+        Case when
+        ASO.SALE_TYPE = 4
+        THEN '车皮'
+        else
+        RC.CARRIER_ABBREVIATION
+        end "carrierName",--承运商
+        SUM(CASE WHEN
+            ASO.SALE_TYPE = 1
+            THEN
+            TWR.RESULT_NET_WEIGHT
+            ELSE 0
+            END) "truckNetWeight",
         SUM(CASE WHEN
         ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
         THEN TWR.RESULT_NET_WEIGHT
@@ -4544,17 +4577,22 @@
         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
         AND OO.CAPACITY_ID!=35128
-        AND NVL(OO.ORDER_TYPE,0) IN(0,1)
+        AND NVL(OO.ORDER_TYPE,0) IN (0,1,4)
         AND ASM.SALE_MATERIAL_ID IS NOT NULL
         AND ASM.SALE_ORDER_ID != -1
-        AND ASO.SALE_ORDER_ISSELF_MENTION='否'
+        AND ASO.SALE_TYPE in (1,4)
+        AND ASO.SALE_ORDER_ISSELF_MENTION !='是'
         <if test="startDate != null">
             and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
             and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
         </if>
-        GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE,RC.CARRIER_ABBREVIATION
+        GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE,(Case when
+        ASO.SALE_TYPE = 4
+        THEN '车皮'
+        else
+        RC.CARRIER_ABBREVIATION
+        end)
         ) T5 ON T0 ."target" = T5."target" AND T0."carrierName" = 	T5."carrierName"
         UNION
         SELECT T1."target",T1."carrierName",

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

@@ -731,6 +731,7 @@
     TTTR.result_balance_time   "aboutTime",
     TTTR.INSERT_TIME "insertTime",
     SU.USER_NAME  "personName",
+    AIR.INSERT_UPDATE_REMARK    "requirementRemark",
     (
     SELECT TTTR2.RESULT_TIME
     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2

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