Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -520,9 +520,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")
@@ -542,9 +541,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

@@ -555,7 +555,6 @@ public interface WMSFeign {
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam Integer warehouseId,
                                     @RequestParam String value);
 
     //库存结转定时器
@@ -572,8 +571,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

@@ -34,6 +34,6 @@ openfeign:
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
-    url: ${JOINFEIGGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:
   port: 8019

src/main/resources/application-prod.yml

@@ -35,6 +35,6 @@ openfeign:
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
-    url: ${JOINFEIGGN_URL:172.16.33.166:8066}
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
   port: 8080