From 014270352f8e19b51bbb4367ae2ff256050a30a2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:03:42 +0800
Subject: [PATCH] #修改优化 1. 字典优化修改 2. 编码规则优化 3. 出库单编码生成为空问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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 e23db73..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,12 +25,14 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "浠撳簱搴撳尯")
@RestController
public class WarehouseAreasController extends BaseController {
@Autowired
private WarehouseAreasService warehouseAreasService;
+ @Autowired
private LocService locService;
@PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@@ -60,6 +65,25 @@
@OperationLog("Create 搴撳尯淇℃伅琛�")
@PostMapping("/warehouseAreas/save")
public R save(@RequestBody WarehouseAreas warehouseAreas) {
+
+ if (Objects.isNull(warehouseAreas)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(warehouseAreas.getName())) {
+ throw new CoolException("搴撳尯鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(warehouseAreas.getCode())) {
+ throw new CoolException("搴撳尯缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+
+ List<WarehouseAreas> list = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getName, warehouseAreas.getName()));
+ if (!list.isEmpty()) {
+ throw new CoolException("搴撳尯鍚嶇О宸插瓨鍦紒锛�");
+ }
+ if (!warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, warehouseAreas.getCode())).isEmpty()) {
+ throw new CoolException("搴撳尯缂栫爜宸插瓨鍦紒锛�");
+ }
+
warehouseAreas.setCreateBy(getLoginUserId());
warehouseAreas.setUpdateBy(getLoginUserId());
if (!warehouseAreasService.save(warehouseAreas)) {
@@ -69,11 +93,45 @@
}
@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.setUpdateTime(new Date());
+ 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, warehouseAreas.getName()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("鍚嶇О宸插瓨鍦紒锛�");
+ }
+ }
+ if (!warehouseAreas.getCode().equals(areas.getCode())) {
+ List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, warehouseAreas.getCode()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("缂栫爜宸插瓨鍦紒锛�");
+ }
+ }
+
if (!warehouseAreasService.updateById(warehouseAreas)) {
return R.error("Update Fail");
}
--
Gitblit v1.9.1