提交

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

@@ -969,6 +969,15 @@ public class WMSController extends BaseRESTfulController {
                                                    String con) {
         return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
     }
+    //    查询所有的钢材物资信息
+    @PostMapping(value = "/getSteelWarehouseList")
+    public Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                   Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                   String con) {
+        return wmsFeign.getSteelWarehouseList(mapVal ==null? new HashMap<>():mapVal,apiId,pageNum,pageSize,con);
+    }
     //    查询所有的钢材物资规格型号信息
     @PostMapping(value = "/getSteelMaterialModelList")
     public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -841,6 +841,12 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer warehouseId,
                                             @RequestParam String con);
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelWarehouseList")
+    Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
     Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
@@ -37,4 +37,4 @@ openfeign:
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
-  port: 8082
+  port: 8080