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

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

@@ -44,6 +44,30 @@ public class WMSHController extends BaseRESTfulController {
         return wmshFeign.getUnloadPortStockList(mapValue, pageNum, pageSize, apiId);
     }
 
+
+    /**
+     * 展示下游港口港存库库存列表
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("getLoadPortStockByMaterialName")
+    @ApiOperation(value = "展示下游港口港存库库存列表")
+    public RESTfulResult getLoadPortStockByMaterialName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                        String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return wmshFeign.getLoadPortStockByMaterialName(mapValue, pageNum, pageSize, apiId,con);
+    }
+
+
     /**
      * 展示万州港港存库库存列表
      *
@@ -58,11 +82,12 @@ public class WMSHController extends BaseRESTfulController {
     public RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer apiId) {
+                                               Integer apiId,
+                                               String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return wmshFeign.getLoadPortStockList(mapValue, pageNum, pageSize, apiId);
+        return wmshFeign.getLoadPortStockList(mapValue, pageNum, pageSize, apiId,con);
     }
 
     /**

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

@@ -46,7 +46,8 @@ public interface WMSHFeign {
     RESTfulResult getLoadPortStockList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                       @RequestParam Integer apiId,
+                                       @RequestParam String con);
 
     /**
      * 查询所有港存库入库实绩
@@ -126,4 +127,11 @@ public interface WMSHFeign {
 
     @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/clearWmshGridMaterial")
     RESTfulResult clearWmshGridMaterial(@RequestBody(required = false) Map<String, Object> wmshInboundResult);
+
+    @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/getLoadPortStockByMaterialName")
+    RESTfulResult getLoadPortStockByMaterialName(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("con")String con);
 }