tijiao

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

@@ -895,6 +895,9 @@ public class AMScontroller{
                                                         Integer pageSize,
                                                         Integer apiId,
                                                         Integer dayplanId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
         return amsFeign.getMaterialMesByDayPlanId(mapValue,pageNum,pageSize,apiId,dayplanId);
     }
 
@@ -913,9 +916,22 @@ public class AMScontroller{
         return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId,dayplanReceiveStatus,carrierId);
     }
 
+    @PostMapping("/getRailOffsetDayplanId")
+    @ApiOperation(value = "根据ID展示钢材发往异地库计划")
+    public Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    Integer dayPlanId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getRailOffsetDayplanId(mapValue, pageNum, pageSize, apiId,dayPlanId);
+    }
+
     @ApiModelProperty(value = "下发钢材发往异地库计划")
     @PostMapping("/issueRailOffsetDayplan")
-    public RESTfulResult issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
+    public Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String,Object>> mapList) {
         return amsFeign.issueRailOffsetDayplan(mapList);
     }
 
@@ -1176,4 +1192,10 @@ public class AMScontroller{
     public Map<String,Object> getdayPlanToTheStationId() {
         return amsFeign.getdayPlanToTheStationId();
     }
+
+    @ApiModelProperty(value = "异地库下拉")
+    @GetMapping("/getOffsetWarehouse")
+    public Map<String,Object> getOffsetWarehouse() {
+        return amsFeign.getOffsetWarehouse();
+    }
 }

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

@@ -1187,6 +1187,10 @@ public interface AmsFeign {
     @GetMapping("/api/v1/ams/amstruckinwardplan/getCarrierList")
     Map<String, Object> getCarrierList();
 
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getOffsetWarehouse")
+    Map<String, Object> getOffsetWarehouse();
+
+
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
     Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
                                      @RequestParam Integer pageNum,
@@ -1212,7 +1216,7 @@ public interface AmsFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/issueRailOffsetDayplan")
-    RESTfulResult issueRailOffsetDayplan(@RequestBody List<Map<String, Object>> mapList);
+    Map<String,Object> issueRailOffsetDayplan(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 到站下拉
@@ -1220,4 +1224,12 @@ public interface AmsFeign {
      */
     @GetMapping("/api/v1/ams/amsrailoffsetdayplan/getdayPlanToTheStationId")
     Map<String, Object> getdayPlanToTheStationId();
+
+
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getRailOffsetDayplanId")
+    Map<String, Object> getRailOffsetDayplanId(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer dayPlanId);
 }