diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java index f20d039..8c83b99 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/PointController.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; 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.jeecg.common.api.vo.Result; 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.service.IPointService; @@ -68,6 +68,7 @@ public class PointController extends JeecgController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "keyword", required = false) String keyword, + @RequestParam(name = "areaCode", required = false) String areaCode, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(point, req.getParameterMap()); @@ -75,6 +76,14 @@ public class PointController extends JeecgController { if (StringUtils.isNotBlank(keyword)) { queryWrapper.and(wrapper -> wrapper.likeRight("point_code", keyword)); } + if(StringUtils.isNotBlank(areaCode)){ + LambdaQueryWrapper areaQueryWrapper = new LambdaQueryWrapper<>(); + List areaCodes= Arrays.asList(areaCode.split(",")); + areaQueryWrapper.in(Area::getAreaCode, areaCodes); + List areaList = areaService.list(areaQueryWrapper); + List areaIds = areaList.stream().map(Area::getId).distinct().toList(); + queryWrapper.in("area_id", areaIds); + } queryWrapper.orderByAsc("point_code"); Page page = new Page(pageNo, pageSize); IPage pageList = pointService.page(page, queryWrapper); diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java index eabdef5..d1c83c4 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/base/controller/StockController.java @@ -58,9 +58,6 @@ public class StockController extends JeecgController { @Autowired private IStockService stockService; - @Autowired - private InventoryMapper inventoryMapper; - /** * 分页列表查询 *