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

demand: OMS系统-对货管理 -进仓对货 - 查询支持根据运单号/进仓单号/创建时间/确认状态/进仓状态查询

Browse Source
This commit is contained in:
aike 2025-12-09 13:12:42 +08:00
parent 02f037d2ad
commit 08cacefa44
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import feign.Response;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
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;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -37,6 +38,7 @@ import java.io.*;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 进仓单Controller * 进仓单Controller
@ -84,9 +86,31 @@ public class Oms2cWarehouseInController extends BaseController
String customerCode=getLoginUser().getUser().getCustomerCode(); String customerCode=getLoginUser().getUser().getCustomerCode();
emisWarehouseIn.setCustomerCode(customerCode); emisWarehouseIn.setCustomerCode(customerCode);
String queryStatusType= MapUtils.getString(emisWarehouseIn.getParams(),"queryStatusType",""); // 将对象转换为 Map，并处理 params 字段
Map<String, Object> queryMap = convertToQueryMap(emisWarehouseIn);
return iRpcWarehouseInSvc.listSimpleByOms(customerCode,queryStatusType,emisWarehouseIn.getSearchValue(),pageNum,pageSize); return iRpcWarehouseInSvc.listSimpleByOms(queryMap, pageNum, pageSize);
}
/**
* 将 EmisWarehouseIn 转换为 Map，并处理 params 字段
*/
@SuppressWarnings("unchecked")
private Map<String, Object> convertToQueryMap(EmisWarehouseIn emisWarehouseIn) {
String jsonString = JSON.toJSONString(emisWarehouseIn);
Map<String, Object> queryMap = (Map<String, Object>) JSON.parseObject(jsonString, Map.class);
// 移除 params 字段，避免类型转换问题
queryMap.remove("params");
// 将 params 中的键值对转换为 params[key]=value 的形式
if (emisWarehouseIn.getParams() != null && emisWarehouseIn.getParams().size() > 0) {
for (Map.Entry<String, Object> entry : emisWarehouseIn.getParams().entrySet()) {
queryMap.put("params[" + entry.getKey() + "]", entry.getValue());
}
}
return queryMap;
} }
/** /**

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

@ -4,7 +4,6 @@ package com.xdadan.erp.oms.service.svc;
import com.xdadan.erp.oms.common.core.domain.AjaxResult; import com.xdadan.erp.oms.common.core.domain.AjaxResult;
import com.xdadan.erp.oms.domain.EmisWarehouseIn; import com.xdadan.erp.oms.domain.EmisWarehouseIn;
import com.xdadan.erp.oms.domain.EmisWarehouseInBatch; import com.xdadan.erp.oms.domain.EmisWarehouseInBatch;
import com.xdadan.erp.oms.domain.vo.WaybillOrder;
import feign.Response; import feign.Response;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.cloud.openfeign.SpringQueryMap;
@ -28,10 +27,7 @@ public interface IRpcWarehouseInSvc {
@GetMapping("/apiweb/emisWarehouseIn/listSimpleByOms") @GetMapping("/apiweb/emisWarehouseIn/listSimpleByOms")
public AjaxResult listSimpleByOms( public AjaxResult listSimpleByOms(@SpringQueryMap Map<String, Object> queryMap,
@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);