tijiao

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

@@ -95,8 +95,10 @@ public class WMSController extends BaseRESTfulController {
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     String  con) {
-        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
+                                                     Integer warehouseId,
+                                                     String startTime,
+                                                     String endTime) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
 
     @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")

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

@@ -89,7 +89,9 @@ public interface WMSFeign {
                                               @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam String con);
+                                              @RequestParam Integer warehouseId,
+                                              @RequestParam String  startTime,
+                                              @RequestParam String  endTime);
 
     /**
      * 新增出库实绩

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:

src/main/resources/bootstrap.yml

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