From 4b5d1e73dc796054194691580c86733a2664508c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:08:17 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 d52fd62..6cb941a 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
@@ -7,20 +7,15 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
-import com.vincent.rsf.server.manager.entity.LocType;
-import com.vincent.rsf.server.manager.entity.LocTypeRela;
-import com.vincent.rsf.server.manager.entity.WarehouseAreas;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.LocMapper;
-import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.mapper.LocTypeRelaMapper;
-import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.LocTypeRelaService;
-import com.vincent.rsf.server.manager.service.LocTypeService;
-import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import springfox.documentation.annotations.ApiIgnore;
import java.util.ArrayList;
import java.util.Date;
@@ -36,6 +31,12 @@
@Autowired
private LocTypeRelaService locTypeRelaService;
+
+ @Autowired
+ private LocAreaRelaService locAreaRelaService;
+
+ @Autowired
+ private LocAreaService locAreaService;
@Autowired
private LocTypeRelaMapper locTypeRelaMapper;
@@ -54,6 +55,8 @@
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.getLength()), Loc::getLength, loc.getLength())
@@ -65,7 +68,8 @@
if (!update) {
throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
}
- return R.ok("鎿嶄綔鎴愬姛锛侊紒");
+
+ return R.ok(loc);
}
@Override
@@ -93,7 +97,7 @@
.setCol(b)
.setLev(l)
.setAreaId(param.getAreaId())
- .setWarehouseId(warehouseAreas.getWareId())
+ .setWarehouseId(warehouseAreas.getWarehouseId())
.setType(param.getType());
list.add(loc);
@@ -108,7 +112,6 @@
@Override
public boolean saveType(Loc loc) {
-
List<LocTypeRela> relas = new ArrayList<>();
loc.getTypeIds().forEach(id -> {
LocTypeRela typeRela = new LocTypeRela();
@@ -117,7 +120,7 @@
relas.add(typeRela);
});
if (!locTypeRelaService.saveOrUpdateBatch(relas)) {
- throw new CoolException("搴撲綅鍏宠仈鍏崇郴淇濆瓨鎴愬姛锛侊紒");
+ throw new CoolException("搴撲綅鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
}
return true;
}
@@ -125,7 +128,6 @@
@Override
public boolean updateLoc(Loc loc) {
locTypeRelaMapper.delete(new LambdaQueryWrapper<LocTypeRela>().eq(LocTypeRela::getLocId, loc.getId()));
-
List<LocTypeRela> relas = new ArrayList<>();
loc.getTypeIds().forEach(id -> {
LocTypeRela typeRela = new LocTypeRela();
@@ -134,8 +136,34 @@
relas.add(typeRela);
});
if (!locTypeRelaService.saveOrUpdateBatch(relas)) {
- throw new CoolException("搴撲綅鍏宠仈鍏崇郴淇濆瓨鎴愬姛锛侊紒");
+ throw new CoolException("搴撲綅鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
}
- return false;
+ return true;
+ }
+
+ @Override
+ public R batchBindLocs(LocModifyParams locs) {
+ if (locs.getId().isEmpty()) {
+ throw new CoolException("搴撲綅ID涓嶈兘涓虹┖锛侊紒");
+ }
+ Loc loc = locs.getLoc();
+ if (Objects.isNull(loc)) {
+ throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ List<LocArea> locAreas = locAreaService.list(new LambdaQueryWrapper<LocArea>().eq(LocArea::getId, locs.getLocAreaId()));
+ if (locAreas.isEmpty()) {
+ throw new CoolException("搴撲綅鍒嗗尯涓嶅瓨鍦紒锛�");
+ }
+ List<LocAreaRela> relas = new ArrayList<>();
+ locs.getId().forEach(id -> {
+ LocAreaRela locAreaRela = new LocAreaRela();
+ locAreaRela.setLocId(id).setLocAreaId(locs.getLocAreaId());
+ relas.add(locAreaRela);
+ });
+ if (!locAreaRelaService.saveBatch(relas)) {
+ throw new CoolException("搴撲綅鍒嗗尯澶辫触锛侊紒");
+ }
+
+ return R.ok();
}
}
--
Gitblit v1.9.1