huojin
/
Cpte-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-12-21 18:40:56 +08:00
parent 32f9edffc3
commit 5be51acf4e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java
View File

@ -9,6 +9,7 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -16,7 +17,6 @@ import org.cpte.modules.base.entity.Area;
import org.cpte.modules.base.service.IAreaService; import org.cpte.modules.base.service.IAreaService;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.cpte.modules.base.entity.Point; import org.cpte.modules.base.entity.Point;
import org.cpte.modules.base.service.IPointService; import org.cpte.modules.base.service.IPointService;
@ -68,6 +68,7 @@ public class PointController extends JeecgController<Point, IPointService> {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@RequestParam(name = "keyword", required = false) String keyword, @RequestParam(name = "keyword", required = false) String keyword,
@RequestParam(name = "areaCode", required = false) String areaCode,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<Point> queryWrapper = QueryGenerator.initQueryWrapper(point, req.getParameterMap()); QueryWrapper<Point> queryWrapper = QueryGenerator.initQueryWrapper(point, req.getParameterMap());
@ -75,6 +76,14 @@ public class PointController extends JeecgController<Point, IPointService> {
if (StringUtils.isNotBlank(keyword)) { if (StringUtils.isNotBlank(keyword)) {
queryWrapper.and(wrapper -> wrapper.likeRight("point_code", keyword)); queryWrapper.and(wrapper -> wrapper.likeRight("point_code", keyword));
} }
if(StringUtils.isNotBlank(areaCode)){
LambdaQueryWrapper<Area> areaQueryWrapper = new LambdaQueryWrapper<>();
List<String> areaCodes= Arrays.asList(areaCode.split(","));
areaQueryWrapper.in(Area::getAreaCode, areaCodes);
List<Area> areaList = areaService.list(areaQueryWrapper);
List<Long> areaIds = areaList.stream().map(Area::getId).distinct().toList();
queryWrapper.in("area_id", areaIds);
}
queryWrapper.orderByAsc("point_code"); queryWrapper.orderByAsc("point_code");
Page<Point> page = new Page<Point>(pageNo, pageSize); Page<Point> page = new Page<Point>(pageNo, pageSize);
IPage<Point> pageList = pointService.page(page, queryWrapper); IPage<Point> pageList = pointService.page(page, queryWrapper);

3
cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java
View File

@ -58,9 +58,6 @@ public class StockController extends JeecgController<Stock, IStockService> {
@Autowired @Autowired
private IStockService stockService; private IStockService stockService;
@Autowired
private InventoryMapper inventoryMapper;
/** /**
* 分页列表查询 * 分页列表查询
* *