From beff9e424cbc5a86fb02ae5b089bd6ae9d04d78e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 14:52:18 +0800
Subject: [PATCH] 修改 1. 仓库修改添加同名空管 2. 仓库库区修改添加同空管
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 16 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 5 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java | 2 -
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java | 5 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 18 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 5 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java | 17 ++++++--
8 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 5c18951..51e73c1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -98,7 +98,6 @@
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
-
String join = StringUtils.join(loc.getTypeIds(), ",");
loc.setType(join);
@@ -166,8 +165,8 @@
if (Objects.isNull(locs)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- locs.setCreateBy(getLoginUser().getId());
- locs.setUpdateBy(getLoginUser().getId());
+ locs.setCreateBy(getLoginUserId());
+ locs.setUpdateBy(getLoginUserId());
return locService.batchBindLocs(locs);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index 3af7f58..e34185e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
+import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -92,7 +93,20 @@
@PostMapping("/matnrGroup/update")
public R update(@RequestBody MatnrGroup matnrGroup) {
matnrGroup.setUpdateBy(getLoginUserId());
- matnrGroup.setUpdateTime(new Date());
+ MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId());
+ if (!matnrGroup.getName().equals(matGroup.getName())) {
+ List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnrGroup.getName()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ }
+ }
+ if (!matnrGroup.getCode().equals(matGroup.getCode())) {
+ List<MatnrGroup> areasList = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getCode, matnrGroup.getCode()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+ }
+
if (!matnrGroupService.updateById(matnrGroup)) {
return R.error("Update Fail");
}
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 ccb02ff..51afd7f 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
@@ -93,7 +93,23 @@
@PostMapping("/warehouseAreas/update")
public R update(@RequestBody WarehouseAreas warehouseAreas) {
warehouseAreas.setUpdateBy(getLoginUserId());
- warehouseAreas.setUpdateTime(new Date());
+ WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getWarehouseId());
+ 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()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ }
+ }
+ if (!warehouseAreas.getCode().equals(areas.getCode())) {
+ List<WarehouseAreas> areasList = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getCode, areas.getCode()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ }
+ }
+
if (!warehouseAreasService.updateById(warehouseAreas)) {
return R.error("Update Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index 7bd0a7c..2f58dc3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -59,9 +59,7 @@
@PostMapping("/warehouseAreasItem/save")
public R save(@RequestBody WarehouseAreasItem warehouseAreasItem) {
warehouseAreasItem.setCreateBy(getLoginUserId());
- warehouseAreasItem.setCreateTime(new Date());
warehouseAreasItem.setUpdateBy(getLoginUserId());
- warehouseAreasItem.setUpdateTime(new Date());
if (!warehouseAreasItemService.save(warehouseAreasItem)) {
return R.error("Save Fail");
}
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 418763b..f97553f 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
@@ -101,14 +101,21 @@
}
warehouse.setUpdateBy(getLoginUserId());
- List<Warehouse> warehouses = warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getName, warehouse.getName()));
- if (!warehouses.isEmpty()) {
- throw new CoolException("浠撳簱鍚嶇О宸插瓨鍦紒锛�");
+ 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 (!warehouseService.list(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, warehouse.getCode())).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");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java
index 59ceaae..34c3375 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocMapper.java
@@ -3,10 +3,13 @@
import com.vincent.rsf.server.manager.entity.Loc;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface LocMapper extends BaseMapper<Loc> {
+ @Update("truncate table man_loc")
+ boolean deleteAll();
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index 91c28af..eb7a072 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -76,9 +76,8 @@
@Transactional(rollbackFor = Exception.class)
public R initLocs(LocMastInitParam param) {
//娓呯┖琛�
- if (this.baseMapper.delete(new LambdaUpdateWrapper<>()) < 0) {
- throw new CoolException("鏁版嵁搴撳垵濮嬪寲澶辫触锛氳�佹暟鎹垹闄ゅけ璐ワ紒锛�");
- }
+ this.baseMapper.deleteAll();
+
WarehouseAreas warehouseAreas = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
.eq(WarehouseAreas::getWarehouseId, param.getWarehouseId())
.eq(WarehouseAreas::getId, param.getAreaId()));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java
index 46e8c59..515ae19 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java
@@ -1,12 +1,17 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.mapper.MatnrGroupMapper;
import com.vincent.rsf.server.manager.entity.MatnrGroup;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.Objects;
+
@Service("matnrGroupService")
public class MatnrGroupServiceImpl extends ServiceImpl<MatnrGroupMapper, MatnrGroup> implements MatnrGroupService {
+
}
--
Gitblit v1.9.1