diff --git a/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java b/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java index 99428b3..dd454f2 100644 --- a/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java +++ b/src/main/java/com/glxp/udi/admin/controller/basic/StackRulesController.java @@ -93,7 +93,7 @@ public class StackRulesController { } } stackRulesService.updateStackRules(stackRulesEntity); - return ResultVOUtils.success("更新成功"); + return ResultVOUtils.success(); } /** @@ -108,7 +108,7 @@ public class StackRulesController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } stackRulesService.delete(deleteRequest.getId()); - return ResultVOUtils.success("删除成功"); + return ResultVOUtils.success(); } } diff --git a/src/main/java/com/glxp/udi/admin/controller/product/StackOrderController.java b/src/main/java/com/glxp/udi/admin/controller/product/StackOrderController.java index 4c03e34..2c89575 100644 --- a/src/main/java/com/glxp/udi/admin/controller/product/StackOrderController.java +++ b/src/main/java/com/glxp/udi/admin/controller/product/StackOrderController.java @@ -75,7 +75,7 @@ public class StackOrderController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } stackOrderService.updateOrder(stackUploadRequest); - return ResultVOUtils.success("更新成功"); + return ResultVOUtils.success(); } @@ -86,7 +86,7 @@ public class StackOrderController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } stackOrderService.deleteById(Integer.parseInt(deleteRequest.getId())); - return ResultVOUtils.success("更新成功"); + return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/udi/admin/req/basic/FilterStackRulesRequest.java b/src/main/java/com/glxp/udi/admin/req/basic/FilterStackRulesRequest.java index 9c5085e..73033b2 100644 --- a/src/main/java/com/glxp/udi/admin/req/basic/FilterStackRulesRequest.java +++ b/src/main/java/com/glxp/udi/admin/req/basic/FilterStackRulesRequest.java @@ -9,6 +9,11 @@ import lombok.Data; @Data public class FilterStackRulesRequest extends ListPageRequest { + /** + * 搜索关键字 + */ + private String key; + /** * 建垛规则名称 */ diff --git a/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java b/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java index 0c26b52..44adede 100644 --- a/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java +++ b/src/main/java/com/glxp/udi/admin/service/basic/StackRulesService.java @@ -49,7 +49,12 @@ public class StackRulesService { */ private QueryWrapper buildWrapper(FilterStackRulesRequest filterStockRulesRequest) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StrUtil.isNotBlank(filterStockRulesRequest.getName()), "name", filterStockRulesRequest.getName()) + wrapper.like(StrUtil.isNotBlank(filterStockRulesRequest.getKey()), "name", filterStockRulesRequest.getKey()) + .or() + .like(StrUtil.isNotBlank(filterStockRulesRequest.getKey()), "prefix", filterStockRulesRequest.getKey()) + .or() + .like(StrUtil.isNotBlank(filterStockRulesRequest.getKey()), "remark", filterStockRulesRequest.getKey()) + .like(StrUtil.isNotBlank(filterStockRulesRequest.getName()), "name", filterStockRulesRequest.getName()) .eq(null != filterStockRulesRequest.getStatus(), "status", filterStockRulesRequest.getStatus()) .eq(StrUtil.isNotBlank(filterStockRulesRequest.getCustomerId()), "customerId", filterStockRulesRequest.getCustomerId()); return wrapper;