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

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

@@ -165,11 +165,13 @@ public class TMSController extends BaseRESTfulController {
      */
     @PostMapping("getShipLocationList")
     @ApiOperation(value = "展示位置作业")
-    public Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue) {
+    public Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   String con
+                                                   ) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue);
+        return tmsshipFeign.getShipLocationList(mapValue==null?new HashMap<>():mapValue,con);
     }
 
     @PostMapping("getShipLocation/{locationId}")

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

@@ -1022,5 +1022,8 @@ public class WMSController extends BaseRESTfulController {
     public Map<String, Object> undoInbound(@RequestParam("inboundId") BigDecimal inboundId){
         return wmsFeign.undoInbound(inboundId);
     }
+
+
+
 }
 

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

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

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

@@ -177,7 +177,9 @@ public interface TmsshipFeign {
                                             @RequestParam String con);
 
     @PostMapping(value = "/api/v1/shipTms/tmsshipshiplocations/getShipLocationList")
-    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue);
+    Map<String, Object> getShipLocationList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam String con
+                                            );
 
 
     /**

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

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

src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign: