Redeem 1 рік тому
батько
коміт
c8c4a770c0

+ 1 - 1
pom.xml

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

+ 3 - 0
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -5624,6 +5624,9 @@
             and RCON.CONSIGNEE_COMPANY_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL || RC2.CARRIER_NAME
             || RC.CAPACITY_NUMBER like Concat('%',Concat(#{remarkThree},'%'))
         </if>
+        <if test="saleOrderNumber != null and saleOrderNumber != '' and saleOrderNumber !='null'">
+            and ASO.SALE_NUMBER LIKE Concat('%',Concat(#{saleOrderNumber},'%'))
+        </if>
         <if test="oneDate != null and orderTypee == 1 and isEnFactoryFlag == 0">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.ORDER_ISSUE_TIME
         </if>

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