修改

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

@@ -230,15 +230,25 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
-  //框计算计算货权转移中出现的批次
-  @PostMapping("/getBatchListForAttorney")
-  public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
+    //为提货委托查询批次
+    @PostMapping("/getBatchListForAttorney")
+    public Map<String, Object> getBatchListForAttorney(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId,
                                           String con){
-      return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
-  }
+        return  tmsshipFeign.getBatchListForAttorney(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    //为装船指令查询批次
+    @PostMapping("/getBatchListForInstruction")
+    public Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+        return  tmsshipFeign.getBatchListForInstruction(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
 
 
     //框计算计算货权转移中出现的批次
@@ -267,11 +277,9 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return tmsshipFeign.getCapacityList(mapValue, pageNum, pageSize, apiId);
+                                               Integer apiId,
+                                               String con) {
+        return tmsshipFeign.getCapacityList(mapValue==null?new HashMap<String, Object>():mapValue,pageNum, pageSize, apiId,con);
     }
 
     /**

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

@@ -249,7 +249,8 @@ public interface TmsshipFeign {
     Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam Integer apiId,
+                                        @RequestParam String con);
 
     /**
      * 展示卸船作业信息列表
@@ -549,6 +550,12 @@ public interface TmsshipFeign {
                                      @RequestParam Integer apiId,
                                      @RequestParam String con);
 
+    @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchListForInstruction")
+    Map<String, Object> getBatchListForInstruction(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam String con);
 
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getBatchIdByForeign")
     Map<String, Object> getBatchIdByForeign(@RequestBody(required = false) Map<String, Object> mapValue,