luobang 2 年之前
父節點
當前提交
8794560065

+ 8 - 2
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1974,7 +1974,13 @@
                     TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
                     R_CARRIER.CARRIER_ID        "carrierId",
-                    OO.CAPACITYIDS "capacityNumbers",
+                    (CASE WHEN
+                        RCA.CAPACITY_NUMBER = '空白'
+                        THEN null
+                        else
+                        OO.CAPACITYIDS
+                        end
+                        ) "capacityNumbers",
                     NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
                     OO.CAN_WORK     "canwork",
                     OO.ORDER_STATUS              "carStatus",
@@ -2052,7 +2058,7 @@
                               ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                     LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
                               ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                                  AND TWR.MATERIAL_ID = RM.MATERIAL_ID
+                             AND TWR.MATERIAL_ID = RM.MATERIAL_ID
                     LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
                               ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                   AND TLR.MATERIAL_ID = RM.MATERIAL_ID

+ 1 - 1
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