From 1dfabf4c4071b77bcd63c30bcbbf58a1a301422a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 17:50:31 +0800
Subject: [PATCH] #修改 1. 库区供应商显示ID修复 2. 物料绑定删掉库区空管
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 23 +++++++++++------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 6 +++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java | 12 ++++++------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java | 1 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java | 2 +-
8 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
index 3ba527a..9a73af3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
@@ -42,6 +42,7 @@
"/pda/login",
"/erp/**",
"/login",
+ "/**/download",
"/register",
"/druid/**",
"/doc.html",
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
index b44a0f5..b031261 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
@@ -183,12 +183,12 @@
if (Objects.isNull(param)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(param.getAreaId())) {
- throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
- }
- if (Objects.isNull(param.getWarehouseId())) {
- throw new CoolException("浠撳簱涓嶈兘涓虹┖锛侊紒");
- }
+// if (Objects.isNull(param.getAreaId())) {
+// throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(param.getWarehouseId())) {
+// throw new CoolException("浠撳簱涓嶈兘涓虹┖锛侊紒");
+// }
if (Objects.isNull(param.getAreaMatId())) {
throw new CoolException("涓诲崟ID涓嶈兘涓虹┖锛侊紒");
}
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 e65f062..ff0cb65 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
@@ -65,13 +65,14 @@
@PostMapping("/matnrGroup/save")
public R save(@RequestBody MatnrGroup matnrGroup) {
if (Objects.isNull(matnrGroup)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+
if (Objects.isNull(matnrGroup.getName())) {
- throw new CoolException("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍒嗙粍鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(matnrGroup.getCode())) {
- throw new CoolException("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍒嗙粍缂栫爜涓嶈兘涓虹┖锛侊紒");
}
matnrGroup.setCreateBy(getLoginUserId());
matnrGroup.setUpdateBy(getLoginUserId());
@@ -80,12 +81,12 @@
.eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
.eq(MatnrGroup::getCode, matnrGroup.getCode()));
if (!list.isEmpty()) {
- throw new CoolException("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
+ return R.error("鐗╂枡鍒嗙粍缂栫爜涓嶈兘閲嶅锛侊紒");
}
List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
.eq(MatnrGroup::getName, matnrGroup.getName()));
if (!groups.isEmpty()) {
- throw new CoolException("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
+ return R.error("鍒嗙粍宸插瓨鍦紝璇峰嬁閲嶅娣诲姞锛侊紒");
}
//鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
@@ -104,10 +105,13 @@
matnrGroup.setUpdateBy(getLoginUserId());
MatnrGroup matGroup = matnrGroupService.getById(matnrGroup.getId());
+ if (Objects.isNull(matGroup)) {
+ return R.error("鐗╂枡鍒嗙粍涓嶅瓨鍦紒锛�");
+ }
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("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
+ return R.error("浠撳簱鍚嶅凡瀛樺湪锛侊紒");
}
}
if (!Objects.isNull(matnrGroup.getCode()) && !matnrGroup.getCode().equals(matGroup.getCode())) {
@@ -115,13 +119,8 @@
.eq(!Objects.isNull(matnrGroup.getParCode()), MatnrGroup::getParCode, matnrGroup.getParCode())
.eq(MatnrGroup::getCode, matnrGroup.getCode()));
if (!areasList.isEmpty()) {
- throw new CoolException("浠撳簱缂栫爜宸插瓨鍦紒锛�");
+ return R.error("浠撳簱缂栫爜宸插瓨鍦紒锛�");
}
- }
-
- //鍒ゆ柇涓婄骇缂栫爜鏄惁涓虹┖
- if (!Objects.isNull(matnrGroup.getParCode()) && !StringUtils.isBlank(matnrGroup.getParCode())) {
- matnrGroup.setCode(matnrGroup.getParCode() + matnrGroup.getCode());
}
if (!matnrGroupService.updateById(matnrGroup)) {
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 64aebaf..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
@@ -115,7 +115,7 @@
@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("鏁版嵁閿欒锛氫粨搴撳簱鍖轰笉瀛樺湪锛侊紒");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java
index b91b7ee..9ead924 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java
@@ -25,6 +25,9 @@
@ApiModelProperty("鍒嗗尯ID")
private Long locAreaId;
+ @ApiModelProperty("搴撲綅绫诲瀷")
+ private List<Long> typeIds;
+
@ApiModelProperty("搴撲綅淇℃伅")
private Loc loc;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index 785efca..0416ab5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -206,7 +206,7 @@
return null;
}
- public String getSupplier$() {
+ public String getSupplierId$() {
CompanysService service = SpringUtils.getBean(CompanysService.class);
Companys supplier = service.getById(this.supplierId);
if (!Cools.isEmpty(supplier)){
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
index 2c7f1c0..d0473e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
@@ -77,7 +77,7 @@
LocAreaMatRela locAreaMatRela = new LocAreaMatRela();
locAreaMatRela
.setAreaMatId(param.getAreaMatId())
- .setAreaId(param.getAreaId())
+// .setAreaId(param.getAreaId())
.setLocId(locId)
.setLocTypeId(typeId)
.setMatnrId(matnrId.getId())
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 c0ae701..15f42fa 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
@@ -49,13 +49,17 @@
throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒");
}
+ String join = locs.getLoc().getType();
+ if (!Objects.isNull(locs.getTypeIds()) && !locs.getTypeIds().isEmpty()) {
+ join = StringUtils.join(locs.getTypeIds(), ",");
+ }
boolean update = this.update(new LambdaUpdateWrapper<Loc>()
.in(Loc::getId, locs.getId())
.eq(Loc::getStatus, 1)
.set(!Objects.isNull(loc.getAreaId()), Loc::getAreaId, loc.getAreaId())
.set(!Objects.isNull(loc.getWarehouseId()), Loc::getWarehouseId, loc.getWarehouseId())
.set(!Objects.isNull(loc.getUseStatus()), Loc::getUseStatus, loc.getUseStatus())
- .set(!Objects.isNull(loc.getType()), Loc::getType, loc.getType())
+ .set(!Objects.isNull(loc.getType()), Loc::getType, join)
.set(!Objects.isNull(loc.getLength()), Loc::getLength, loc.getLength())
.set(!Objects.isNull(loc.getWidth()), Loc::getWidth, loc.getWidth())
.set(!Objects.isNull(loc.getHeight()), Loc::getHeight, loc.getHeight())
--
Gitblit v1.9.1