Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -879,8 +879,11 @@ public class TMSController extends BaseRESTfulController {
                                           @RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize){
-        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+                                          Integer pageSize,
+                                          String wagon,
+                                          String purchaseOrderNum,
+                                          String materialName){
+        return tmsTrainFeign.getWagonNo(resultType, mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,wagon,purchaseOrderNum,materialName);
     }
 
     @ApiOperation(value = "查询所有发运计划")
@@ -1958,8 +1961,8 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getLoadResultToSendMC( @RequestBody(required = false) Map<String, Object> mapValue,
             Integer apiId,
             Integer pageNum,
-            Integer pageSize,Integer resultType) {
-        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType);
+            Integer pageSize,Integer resultType,String con) {
+        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,con);
     }
 
     @ApiOperation(value = "批量新增计量委托")

src/main/java/com/steerinfo/dil/feign/TmsTrainFeign.java

@@ -70,7 +70,10 @@ public interface TmsTrainFeign {
                                     @RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam("apiId") Integer apiId,
                                     @RequestParam("pageNum") Integer pageNum,
-                                    @RequestParam("pageSize") Integer pageSize);
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("wagon") String wagon,
+                                    @RequestParam("purchaseOrderNum") String purchaseOrderNum,
+                                    @RequestParam("materialName")String materialName);
 
     /*
         TmstrainWagonUnloadResultController
@@ -248,7 +251,8 @@ public interface TmsTrainFeign {
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("resultType") Integer resultType
+                                               @RequestParam("resultType") Integer resultType,
+                                               @RequestParam("con") String con
                                                );
 
     @ApiOperation(value = "批量新增计量委托")