“修改”

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

@@ -114,6 +114,14 @@ public class BMSController extends BaseRESTfulController {
         return bmsshipFeign.deletePortHandlingFeeSecond(feeId);
     }
 
+
+    @PostMapping("addwaterStatement")
+    @ApiOperation(value = "修改港口装卸费信息")
+    Map<String,Object> addwaterStatement(@RequestBody Map<String, Object> map) {
+        return bmsshipFeign.addwaterStatement(map);
+    }
+
+
     @PostMapping("getUncomplateDetailsOrderList")
     @ApiOperation(value = "展示未生成账单的详单信息")
     public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -1642,11 +1642,10 @@ public class TMSController extends BaseRESTfulController {
     @PostMapping("/getResultType")
     public Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
                                                                         Integer apiId,
-                                                                Integer pageNum,
-                                                                Integer pageSize,
+
                                                                 String con
     ) {
-        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId, pageNum, pageSize,con);
+        return tmsTrainFeign.getResultType(map == null ? new HashMap<>() : map,apiId,con);
     }
 
     @PostMapping("/addShipLoadResult")

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

@@ -82,6 +82,16 @@ public class WMSHController extends BaseRESTfulController {
     }
 
 
+    @PostMapping("selectLoadResult")
+    @ApiOperation(value = "展示万州港口港存库库存列表")
+    public Map<String, Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.selectLoadResult(mapValue,con);
+    }
+
     /**
      * 展示万州港港存库库存列表
      *

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

@@ -292,4 +292,8 @@ public interface BmsshipFeign {
 
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/deletePortHandlingFeeSecond/{feeId}")
     Map<String,Object> deletePortHandlingFeeSecond(@PathVariable("feeId")BigDecimal feeId);
+
+
+    @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/addwaterStatement")
+    Map<String, Object> addwaterStatement(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -298,8 +298,6 @@ public interface TmsTrainFeign {
     @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/getResultType")
     Map<String, Object> getResultType(@RequestBody(required = false)Map<String,Object> map,
                                       @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("con") String con);
 
     @PostMapping(value =  "api/v1/trainTms/tmstrainloadingresults/addShipLoadResult")

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

@@ -141,4 +141,8 @@ public interface WMSHFeign {
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("con") String con);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/selectLoadResult")
+    Map<String,Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam("con") String con);
 }

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:

src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ openfeign:
 piction:
   # path: /usr/share/nginx/html/image
   #  path: /test/data/nginx/html/image
-  path: C:\Users\24390\Desktop\work\a
-#  path: /shared
+#  path: C:\Users\24390\Desktop\work\a
+  path: /shared
 server:
   port: 8080