提交

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

@@ -40,14 +40,15 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                   Integer warehouseId,
                                                    String startTime,
                                                    String endTime) {
-        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
     @PostMapping("getWmsInboundResultStatistics")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "445", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
@@ -67,9 +68,10 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                   Integer warehouseId,
                                                    String startTime,
                                                    String endTime) {
-        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
+        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
     @PostMapping("getWmsReservedResult")
     @ApiOperation(value = "展示预留入库实绩信息")

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

@@ -34,6 +34,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);
 
@@ -53,6 +54,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);
 

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: