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-09-08 17:08:45 +08:00
parent 72c078dc04
commit a07281ccaf
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java
View File

@ -25,6 +25,7 @@ import com.xdadan.erp.oms.service.svc.IRpcWarehouseInSvc;
import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc; import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc;
import feign.Response; import feign.Response;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -73,6 +74,7 @@ public class Oms2cWarehouseInController extends BaseController
} }
@Log(title = "进仓单列表", businessType = BusinessType.OTHER)
@GetMapping("/listSimple") @GetMapping("/listSimple")
public AjaxResult listSimple(EmisWarehouseIn emisWarehouseIn) public AjaxResult listSimple(EmisWarehouseIn emisWarehouseIn)
{ {
@ -83,7 +85,9 @@ public class Oms2cWarehouseInController extends BaseController
String customerCode=getLoginUser().getUser().getCustomerCode(); String customerCode=getLoginUser().getUser().getCustomerCode();
emisWarehouseIn.setCustomerCode(customerCode); emisWarehouseIn.setCustomerCode(customerCode);
return iRpcWarehouseInSvc.listSimple(emisWarehouseIn,pageNum,pageSize); String queryStatusType= MapUtils.getString(emisWarehouseIn.getParams(),"queryStatusType","");
return iRpcWarehouseInSvc.listSimple(customerCode,queryStatusType,emisWarehouseIn.getSearchValue(),pageNum,pageSize);
} }
/** /**

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

@ -26,17 +26,11 @@ public interface IRpcWarehouseInSvc {
@RequestParam("pageSize") Integer pageSize); @RequestParam("pageSize") Integer pageSize);
@GetMapping("/apiweb/emisWarehouseIn/listSimple1")
public AjaxResult listSimple1(
@RequestParam("customerCode") String customerCode,
@RequestParam("params") Map<String,Object> params,
@RequestParam("searchValue") String searchValue,
@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize);
@GetMapping("/apiweb/emisWarehouseIn/listSimple") @GetMapping("/apiweb/emisWarehouseIn/listSimple")
public AjaxResult listSimple( public AjaxResult listSimple(
@SpringQueryMap EmisWarehouseIn emisWarehouseIn, @RequestParam("customerCode") String customerCode,
@RequestParam("queryStatusType") String queryStatusType,
@RequestParam("searchValue") String searchValue,
@RequestParam("pageNum") Integer pageNum, @RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize); @RequestParam("pageSize") Integer pageSize);