Redeem 1 year ago
parent
commit
e5c4f03b35

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-dazhou-api</artifactId>
-    <version>1.8</version>
+    <version>1.9</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

+ 4 - 2
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -2334,11 +2334,13 @@ public class AMScontroller{
     public Map<String,Object> getTransPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId){
+                                               Integer apiId,
+                                               String startTime,
+                                               String endTime){
         if(mapValue==null){
             mapValue=new HashMap<>();
         }
-        return amsFeign.getTransPlan(mapValue,pageNum,pageSize,apiId);
+        return amsFeign.getTransPlan(mapValue,pageNum,pageSize,apiId,startTime,endTime);
     }
 
     @ApiOperation(value="审核转运计划")

+ 3 - 1
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1937,7 +1937,9 @@ public interface AmsFeign {
     Map<String, Object> getTransPlan(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId);
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
 
     @PostMapping("/api/v1/ams/OyeWarehouse/addTransPlan")
     Map<String, Object> addTransPlan(@RequestBody Map<String, Object> mapValue);

+ 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