From a27be22b8e8f4d0eb48f560303041c8a961202a9 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期五, 21 三月 2025 12:49:56 +0800
Subject: [PATCH] #新增 1. 新增库位分区绑定
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 48 ++++++++++++++++++-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocModifyParams.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java | 10 ++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 10 +++++
6 files changed, 65 insertions(+), 12 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 2521ad4..b99f16b 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
@@ -159,6 +159,16 @@
return locService.modifyLocs(locs);
}
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @PostMapping("/loc/batch/area")
+ @ApiOperation("搴撲綅鎵归噺鍒嗗尯")
+ public R batchLocArea(@RequestBody LocModifyParams locs) {
+ if (Objects.isNull(locs)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return locService.batchBindLocs(locs);
+ }
+
@PreAuthorize("hasAuthority('manager:loc:update')")
@ApiOperation("搴撲綅鍒濆鍖�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
index f54383d..f0332ef 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocTypeController.java
@@ -77,8 +77,16 @@
@OperationLog("Update loc type")
@PostMapping("/locType/update")
public R update(@RequestBody LocType locType) {
+ if (Objects.isNull(locType.getName())) {
+ throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(locType.getCode())) {
+ throw new CoolException("搴撲綅缂栫爜涓嶄负绌猴紒锛�");
+ }
+ if (Objects.isNull(locType.getRegex())) {
+ throw new CoolException("搴撲綅瑙勫垯琛ㄨ揪寮忎笉鑳戒负绌猴紒锛�");
+ }
locType.setUpdateBy(getLoginUserId());
- locType.setUpdateTime(new Date());
if (!locTypeService.updateById(locType)) {
return R.error("Update Fail");
}
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 593bb16..c3108d3 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
@@ -22,6 +22,10 @@
@ApiModelProperty("涓诲崟ID")
private List<Long> id;
+ @ApiModelProperty("鍒嗗尯ID")
+ private Long locAreaId;
+
@ApiModelProperty("搴撲綅淇℃伅")
private Loc loc;
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
index 4b6490d..4cc0ce6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaRela.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,6 +24,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_loc_area_rela")
public class LocAreaRela implements Serializable {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java
index 66c9a70..839bac3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocService.java
@@ -17,4 +17,6 @@
boolean saveType(Loc typeIds);
boolean updateLoc(Loc loc);
+
+ R batchBindLocs(LocModifyParams locs);
}
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 b363b77..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;
@@ -67,7 +68,8 @@
if (!update) {
throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
}
- return R.ok("鎿嶄綔鎴愬姛锛侊紒");
+
+ return R.ok(loc);
}
@Override
@@ -110,7 +112,6 @@
@Override
public boolean saveType(Loc loc) {
-
List<LocTypeRela> relas = new ArrayList<>();
loc.getTypeIds().forEach(id -> {
LocTypeRela typeRela = new LocTypeRela();
@@ -127,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();
@@ -140,4 +140,30 @@
}
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