aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-31 15:34:59 +08:00
parent 38593f9a55
commit 85f6f46ab0
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
View File

@ -21,6 +21,8 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.oms.common.core.domain.entity.SysOmsUser; import com.xdadan.erp.oms.common.core.domain.entity.SysOmsUser;
import com.xdadan.erp.oms.common.core.page.PageDomain;
import com.xdadan.erp.oms.common.core.page.TableSupport;
import com.xdadan.erp.oms.common.utils.DateUtils; import com.xdadan.erp.oms.common.utils.DateUtils;
import com.xdadan.erp.oms.common.utils.HTTPHelperV3; import com.xdadan.erp.oms.common.utils.HTTPHelperV3;
import com.xdadan.erp.oms.common.utils.VerifyCodeUtil; import com.xdadan.erp.oms.common.utils.VerifyCodeUtil;
@ -219,8 +221,13 @@ public class Oms2cWaybillController extends BaseController
} }
@GetMapping("/listWmsWarehouse") @GetMapping("/listWmsWarehouse")
public AjaxResult listWmsWarehouse(Integer pageNum,Integer pageSize,String searchValue) public AjaxResult listWmsWarehouse(WmsWarehouse wmsWarehouse)
{ {
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
// @RequestBody WmsWarehouse wmsWarehouse, // @RequestBody WmsWarehouse wmsWarehouse,
// WmsWarehouse wmsWarehouse = new WmsWarehouse(); // WmsWarehouse wmsWarehouse = new WmsWarehouse();
// wmsWarehouse.setSearchValue(searchValue); // wmsWarehouse.setSearchValue(searchValue);
@ -231,7 +238,7 @@ public class Oms2cWaybillController extends BaseController
if(pageSize==null){ if(pageSize==null){
pageNum=10; pageNum=10;
} }
return iRpcWmsWarehouseSvc.listWmsWarehouse(searchValue,pageNum,pageSize); return iRpcWmsWarehouseSvc.listWmsWarehouse(wmsWarehouse.getSearchValue(),wmsWarehouse.getParams(),pageNum,pageSize);
} }

9
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWmsWarehouseSvc.java
View File

@ -11,12 +11,17 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import java.util.Map;
@FeignClient(name = "IRpcWmsWarehouseSvc",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class}) @FeignClient(name = "IRpcWmsWarehouseSvc",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class})
public interface IRpcWmsWarehouseSvc { public interface IRpcWmsWarehouseSvc {
@GetMapping("/apiweb/wmsWarehouse/listWmsWarehouse") @GetMapping("/apiweb/wmsWarehouse/listWmsWarehouse")
public AjaxResult listWmsWarehouse(@RequestParam("searchValue")String searchValue, public AjaxResult listWmsWarehouse(
@RequestParam("searchValue")String searchValue,
@RequestParam("params") Map<String,Object> params,
@RequestParam("pageNum") Integer pageNum, @RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize")Integer pageSize); @RequestParam("pageSize")Integer pageSize
);
} }