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/manager/controller/DeviceSiteController.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java index b3da571..bc4524a 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java @@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame; import com.vincent.rsf.server.manager.entity.DeviceSite; import com.vincent.rsf.server.manager.service.DeviceSiteService; 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.*; @@ -20,6 +24,7 @@ import java.util.*; @RestController +@Api(tags = "绔欑偣绠$悊") public class DeviceSiteController extends BaseController { @Autowired @@ -107,4 +112,14 @@ ExcelUtil.build(ExcelUtil.create(deviceSiteService.list(), DeviceSite.class), response); } + @PreAuthorize("hasAuthority('manager:deviceSite:save')") + @ApiOperation("绔欑偣鍒濆鍖�") + @PostMapping("/deviceSite/init") + public R initDeviceSite(@RequestBody DeviceSiteParame param) { + if (Objects.isNull(param)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return R.ok(deviceSiteService.initSites(param)); + } + } -- Gitblit v1.9.1