tijao

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

@@ -144,9 +144,10 @@ public class WMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
-                                                      Integer warehouseId,
+                                                      String warehouseId,
+                                                      String time,
                                                       String con) {
-        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,con);
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
 
     }
 //    查询仓库中超过库龄预警的物资

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

@@ -152,7 +152,8 @@ public interface WMSFeign {
                                                @RequestParam Integer apiId,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer warehouseId,
+                                               @RequestParam String warehouseId,
+                                               @RequestParam String time,
                                                @RequestParam String con);
 
     /**

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:localhost: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:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8