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

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

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

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -551,7 +552,12 @@ public interface WMSFeign {
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam String con);
+                                    @RequestParam Integer warehouseId,
+                                    @RequestParam String value);
+
+    //库存结转定时器
+    @PostMapping(value = "/api/v1/wms/inventoryClose/addInventoryClose")
+    RESTfulResult addInventoryClose();
 
     /**
      * 收发存报表