From 203e553223a51b1e80c3d764363771c4d9453b8d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 15:06:14 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
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 6cb941a..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,14 +76,14 @@
@Transactional(rollbackFor = Exception.class)
public R initLocs(LocMastInitParam param) {
//娓呯┖琛�
- if (this.baseMapper.delete(new LambdaUpdateWrapper<>()) < 0) {
- throw new CoolException("鏁版嵁搴撳垵濮嬪寲澶辫触锛氳�佹暟鎹垹闄ゅけ璐ワ紒锛�");
- }
- WarehouseAreas warehouseAreas = warehouseAreasService.getById(param.getAreaId());
+ this.baseMapper.deleteAll();
+
+ WarehouseAreas warehouseAreas = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getWarehouseId, param.getWarehouseId())
+ .eq(WarehouseAreas::getId, param.getAreaId()));
if (Objects.isNull(warehouseAreas)) {
throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
}
-
List<Loc> list = new ArrayList<>();
for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
@@ -99,7 +99,6 @@
.setAreaId(param.getAreaId())
.setWarehouseId(warehouseAreas.getWarehouseId())
.setType(param.getType());
-
list.add(loc);
}
}
@@ -146,8 +145,7 @@
if (locs.getId().isEmpty()) {
throw new CoolException("搴撲綅ID涓嶈兘涓虹┖锛侊紒");
}
- Loc loc = locs.getLoc();
- if (Objects.isNull(loc)) {
+ if (Objects.isNull(locs.getLocAreaId())) {
throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒");
}
List<LocArea> locAreas = locAreaService.list(new LambdaQueryWrapper<LocArea>().eq(LocArea::getId, locs.getLocAreaId()));
@@ -157,7 +155,8 @@
List<LocAreaRela> relas = new ArrayList<>();
locs.getId().forEach(id -> {
LocAreaRela locAreaRela = new LocAreaRela();
- locAreaRela.setLocId(id).setLocAreaId(locs.getLocAreaId());
+ locAreaRela.setLocId(id)
+ .setLocAreaId(locs.getLocAreaId());
relas.add(locAreaRela);
});
if (!locAreaRelaService.saveBatch(relas)) {
--
Gitblit v1.9.1