合并采购进口矿火运

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

@@ -695,8 +695,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getTmstrainWagonLoad(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
-                                              Integer pageSize){
-        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+                                              Integer pageSize,
+                                              Integer resultType){
+        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType);
     }
 
 
@@ -760,9 +761,9 @@ public class TMSController extends BaseRESTfulController {
     }
 
     @ApiOperation(value="获取装车车皮号")
-    @GetMapping(value = "/getWagonNo")
-    public Map<String, Object> getWagonNo(){
-        return tmsTrainFeign.getWagonNo();
+    @GetMapping(value = "/getWagonNo/{resultType}")
+    public Map<String, Object> getWagonNo(@PathVariable("resultType") Integer resultType){
+        return tmsTrainFeign.getWagonNo(resultType);
     }
 
     @ApiOperation(value="查询所有发运计划")
@@ -819,8 +820,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 Integer apiId,
                                                 Integer pageNum,
-                                                Integer pageSize){
-        return tmsTrainFeign.getTmstrainWagonUnLoad(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+                                                Integer pageSize,
+                                                Integer resultType){
+        return tmsTrainFeign.getTmstrainWagonUnLoad(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType);
     }
 
     @ApiOperation(value="通过主键删除车皮卸车作业实绩")
@@ -902,9 +904,10 @@ public class TMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer status){
+                                           Integer status,
+                                                 Integer resultType){
 
-        return tmsTrainFeign.getAllWagonPlease(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, status);
+        return tmsTrainFeign.getAllWagonPlease(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, status, resultType);
     }
 
     @ApiOperation(value="通过Id查询请车作业")
@@ -969,8 +972,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
                                                   Integer apiId,
                                                   Integer pageNum,
-                                                  Integer pageSize){
-        return tmsTrainFeign.getApproveAllWagonPlease(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+                                                  Integer pageSize,
+                                                        Integer resultType){
+        return tmsTrainFeign.getApproveAllWagonPlease(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType);
     }
 
     @ApiOperation(value="通过Id查询批车作业")

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

@@ -28,7 +28,8 @@ public interface TmsTrainFeign {
     public Map<String, Object> getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize);
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("resultType") Integer resultType);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")
@@ -60,8 +61,8 @@ public interface TmsTrainFeign {
     public Map<String, Object> getBatchId();
 
 
-    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo")
-    public Map<String, Object> getWagonNo();
+    @GetMapping(value = "api/v1/trainTms/tmstrainloadingresults/getWagonNo/{resultType}")
+    public Map<String, Object> getWagonNo(@PathVariable("resultType")Integer resultType);
 
 
     /*
@@ -72,7 +73,8 @@ public interface TmsTrainFeign {
     public Map<String, Object> getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize);
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("resultType") Integer resultType);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainwagonunloadresults/deleteTmstrainWagonUnLoadResultByUnLoadingId")
@@ -115,7 +117,9 @@ public interface TmsTrainFeign {
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
-                                           @RequestParam("status") Integer status);
+                                           @RequestParam("status") Integer status,
+                                                 @RequestParam("resultType") Integer resultType
+                                                 );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getWagonPleaseById/{resultId}")
     public Map<String, Object> getWagonPleaseById(@PathVariable("resultId")Integer resultId);
@@ -147,7 +151,9 @@ public interface TmsTrainFeign {
     public Map<String, Object> getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
                                                   @RequestParam("apiId") Integer apiId,
                                                   @RequestParam("pageNum") Integer pageNum,
-                                                  @RequestParam("pageSize") Integer pageSize);
+                                                  @RequestParam("pageSize") Integer pageSize,
+                                                        @RequestParam("resultType") Integer resultType
+    );
 
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveWagonPleaseById/{resultId}")
     public Map<String, Object> getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId);
@@ -170,7 +176,8 @@ public interface TmsTrainFeign {
     Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
                                                         @RequestParam("apiId") Integer apiId,
                                                         @RequestParam("pageNum") Integer pageNum,
-                                                        @RequestParam("pageSize") Integer pageSize);
+                                                        @RequestParam("pageSize") Integer pageSize
+                                                        );
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
     Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
     @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")