From 59251b6445daef3729a205fc7054fcbdc55b060a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 16 四月 2025 11:16:05 +0800 Subject: [PATCH] #修复 1. 收货单新增物料时分组查询不生效 2. 综合订单分页数调整 3. 物料列表报错修复 --- rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java index 7cdb3fe..5d55317 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java @@ -12,6 +12,8 @@ import com.vincent.rsf.server.system.entity.Fields; import com.vincent.rsf.server.system.service.FieldsService; import com.vincent.rsf.server.system.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -19,6 +21,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; +@Api(tags = "鍔ㄦ�佹墿灞曞瓧娈�") @RestController public class FieldsController extends BaseController { @@ -40,6 +43,13 @@ } @PreAuthorize("hasAuthority('system:fields:list')") + @GetMapping("/fields/enable/list") + @ApiOperation("鑾峰彇宸插紑鍚墿灞曞瓧娈�") + public R getEnableList() { + return R.ok(fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1))); + } + + @PreAuthorize("hasAuthority('system:fields:list')") @PostMapping({"/fields/many/{ids}", "/fieldss/many/{ids}"}) public R many(@PathVariable Long[] ids) { return R.ok().add(fieldsService.listByIds(Arrays.asList(ids))); -- Gitblit v1.9.1