2.28

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

@@ -517,9 +517,8 @@ public class WMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer warehouseId,
                                            String  value) {
-        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,value);
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
     }
     //库存结转定时器
     @PostMapping("/addInventoryClose")
@@ -539,9 +538,9 @@ public class WMSController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String con,
                                         String startTime,
-                                        String endTime,
-                                        Integer warehouseId) {
-        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime,warehouseId);
+                                        String endTime
+                                      ) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 
     /**

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

@@ -552,7 +552,6 @@ public interface WMSFeign {
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam Integer warehouseId,
                                     @RequestParam String value);
 
     //库存结转定时器
@@ -569,8 +568,8 @@ public interface WMSFeign {
                                  @RequestParam Integer pageSize,
                                  @RequestParam String con,
                                  @RequestParam String startTime,
-                                 @RequestParam String endTime,
-                                 @RequestParam Integer warehouseId);
+                                 @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/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