luobang 1 year ago
parent
commit
ab9fdd2051

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -4760,7 +4760,7 @@
                         LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF
                         ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
                         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-                        ON TWR.MATERIAL_ID = ASM.MATERIAL_ID
+                        ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
                         LEFT JOIN (
                               SELECT "saleNo",
                               SUM("weight") "sumWeight"

+ 1 - 1
src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J\u914D\u7F6E
-log4j.rootCategory=INFO,file,RUNNING,errorfile
+log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
 ## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout