From 1a2cc3cb5eccca12d3bdd0d4027f8fb4e417c63e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 16:17:48 +0800
Subject: [PATCH] 修改 1. 往来企业新增，修改添加空管 2. 物料分组添加默认排序
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 6 ++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java | 34 +++++++++++++++++++++++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 1 -
3 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
index 9e69bb6..23f6804 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
@@ -11,6 +11,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -67,6 +68,15 @@
if (Objects.isNull(companys.getType())) {
throw new CoolException("浼佷笟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
+
+ List<Companys> warehouses = companysService.list(new LambdaQueryWrapper<Companys>().eq(Companys::getName, companys.getName()));
+ if (!warehouses.isEmpty()) {
+ throw new CoolException("浼佷笟鍚嶇О宸插瓨鍦紒锛�");
+ }
+ if (!companysService.list(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, companys.getBreifCode())).isEmpty()) {
+ throw new CoolException("缂栫爜宸插瓨鍦紒锛�");
+ }
+
companys.setCreateBy(getLoginUserId());
companys.setUpdateBy(getLoginUserId());
if (!companysService.save(companys)) {
@@ -80,7 +90,29 @@
@PostMapping("/companys/update")
public R update(@RequestBody Companys companys) {
companys.setUpdateBy(getLoginUserId());
- companys.setUpdateTime(new Date());
+ if (Objects.isNull(companys.getName())) {
+ throw new CoolException("鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(companys.getBreifCode())) {
+ throw new CoolException("鍔╄鐮佷笉鑳戒负绌�!!");
+ }
+ if (Objects.isNull(companys.getType())) {
+ throw new CoolException("绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ Companys companys1 = companysService.getById(companys.getId());
+ if (!companys.getName().equals(companys1.getName())) {
+ List<Companys> areasList = companysService.list(new LambdaQueryWrapper<Companys>().eq(Companys::getName, companys.getName()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("浼佷笟鍚嶅凡瀛樺湪锛侊紒");
+ }
+ }
+ if (!companys.getBreifCode().equals(companys1.getBreifCode())) {
+ List<Companys> areasList = companysService.list(new LambdaQueryWrapper<Companys>().eq(Companys::getBreifCode, companys.getBreifCode()));
+ if (!areasList.isEmpty()) {
+ throw new CoolException("缂栫爜宸插瓨鍦紒锛�");
+ }
+ }
+
if (!companysService.updateById(companys)) {
return R.error("Update Fail");
}
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 5911c69..2c900a8 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
@@ -106,7 +106,6 @@
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
-
if (!locService.updateLoc(loc)) {
throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
}
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 e34185e..fbc7197 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
@@ -35,6 +35,7 @@
@PostMapping("/matnrGroup/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
+ baseParam.setOrderBy("code asc");
PageParam<MatnrGroup, BaseParam> pageParam = new PageParam<>(baseParam, MatnrGroup.class);
return R.ok().add(matnrGroupService.page(pageParam, pageParam.buildWrapper(true)));
}
@@ -142,12 +143,13 @@
public R tree(@RequestBody(required = false) Map<String, Object> map) {
List<MatnrGroup> matnrs = new ArrayList<>();
if (Objects.isNull(map)) {
- matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
+ matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().orderByAsc(MatnrGroup::getCode));
} else {
if (Objects.isNull(map.get("condition"))) {
return R.ok("condition鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().like(MatnrGroup::getName, map.get("condition")));
+ matnrs = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .like(MatnrGroup::getName, map.get("condition")).orderByAsc(MatnrGroup::getCode));
}
List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
return R.ok().add(treeData);
--
Gitblit v1.9.1