From 43603b427b99317c3191b15abfd95a25fe1692c8 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 08 五月 2025 13:37:00 +0800 Subject: [PATCH] # --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java index 51afd7f..3884999 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java @@ -10,11 +10,14 @@ 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.WarehouseAreaParam; import com.vincent.rsf.server.manager.entity.Loc; import com.vincent.rsf.server.manager.entity.WarehouseAreas; import com.vincent.rsf.server.manager.service.LocService; import com.vincent.rsf.server.manager.service.WarehouseAreasService; 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.*; @@ -22,6 +25,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; +@Api(tags = "浠撳簱搴撳尯") @RestController public class WarehouseAreasController extends BaseController { @@ -89,24 +93,42 @@ } @PreAuthorize("hasAuthority('manager:warehouseAreas:update')") + @ApiOperation("搴撳尯鎵归噺淇敼") + @PostMapping("/warehouseAreas/batch/update") + public R batchUpdate(@RequestBody WarehouseAreaParam params) { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(params.getIds()) && params.getIds().isEmpty()) { + return R.error("搴撳尯ID涓嶈兘涓虹┖锛侊紒"); + } + if (warehouseAreasService.batchUpdate(params, getLoginUserId())) { + return R.ok("淇敼鎴愬姛锛侊紒"); + } else { + return R.error("淇敼澶辫触锛侊紒"); + } + } + + + @PreAuthorize("hasAuthority('manager:warehouseAreas:update')") @OperationLog("Update 搴撳尯淇℃伅琛�") @PostMapping("/warehouseAreas/update") public R update(@RequestBody WarehouseAreas warehouseAreas) { warehouseAreas.setUpdateBy(getLoginUserId()); - WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getWarehouseId()); + WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getId()); if (Objects.isNull(areas)) { throw new CoolException("鏁版嵁閿欒锛氫粨搴撳簱鍖轰笉瀛樺湪锛侊紒"); } if (!warehouseAreas.getName().equals(areas.getName())) { - List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getName, areas.getName())); + List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getName, warehouseAreas.getName())); if (!areasList.isEmpty()) { - throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒"); + throw new CoolException("鍚嶇О宸插瓨鍦紒锛�"); } } if (!warehouseAreas.getCode().equals(areas.getCode())) { - List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, areas.getCode())); + List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, warehouseAreas.getCode())); if (!areasList.isEmpty()) { - throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�"); + throw new CoolException("缂栫爜宸插瓨鍦紒锛�"); } } -- Gitblit v1.9.1