From bcd9cb83cbbb36217cb99ced7bf1fa3cb26bd53c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 16:59:51 +0800
Subject: [PATCH] #wms端生成任务优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index 7c3c51f..86ee120 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.service.WarehouseService;
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.*;
@@ -73,6 +74,14 @@
if (Objects.isNull(warehouse.getName())) {
throw new CoolException("浠撳簱鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
+ List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
+ if (!warehouses.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶇О宸插瓨鍦紒锛�");
+ }
+ if (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+
warehouse.setCreateBy(getLoginUserId());
warehouse.setUpdateBy(getLoginUserId());
if (!warehouseService.save(warehouse)) {
@@ -92,6 +101,22 @@
throw new CoolException("浠撳簱鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
warehouse.setUpdateBy(getLoginUserId());
+
+ Warehouse warehouse1 = warehouseService.getById(warehouse.getId());
+ if (!warehouse.getName().equals(warehouse1.getName())) {
+ List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse1.getName()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ }
+ }
+ if (!warehouse.getCode().equals(warehouse1.getCode())) {
+ List<Warehouse> areasList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse1.getCode()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+ }
+
+
if (!warehouseService.updateById(warehouse)) {
return R.error("Update Fail");
}
@@ -105,7 +130,8 @@
if (ids.length < 1) {
throw new CoolException("鏌ヨid涓嶈兘涓虹┖锛侊紒");
}
- List<WarehouseAreas> warehouseAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().in(WarehouseAreas::getWareId, ids));
+ List<WarehouseAreas> warehouseAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .in(WarehouseAreas::getWarehouseId, ids));
if (!warehouseAreas.isEmpty()) {
throw new CoolException("褰撳墠浠撳簱涓嬫湁鏈垹闄ゅ簱鍖猴紝 涓嶅彲鎿嶄綔鍒犻櫎锛侊紒");
}
@@ -141,4 +167,11 @@
ExcelUtil.build(ExcelUtil.create(list, Warehouse.class), response);
}
+ @ApiOperation("鑾峰彇浠撳簱鏍戠姸鍥�")
+ @PreAuthorize("hasAuthority('manager:warehouse:list')")
+ @PostMapping("/warehouse/areas")
+ public R getAreasForWarehouse(@RequestBody Map<String, Object> param) {
+ return R.ok(warehouseService.getAllWarehouseAreas(param));
+ }
+
}
--
Gitblit v1.9.1