From 6883e31331af4633d1b7d74ea7deb5f972afa05d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 20:02:19 +0800
Subject: [PATCH] 新增移库功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 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 63d4d69..c2fdab5 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
@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.service.impl;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.R;
@@ -16,13 +15,10 @@
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;
import java.util.List;
import java.util.Objects;
-import java.util.stream.Collectors;
@Service("locService")
public class LocServiceImpl extends ServiceImpl<LocMapper, Loc> implements LocService {
@@ -53,13 +49,17 @@
throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒");
}
+ String join = loc.getType();
+ if (!Objects.isNull(loc.getTypeIds()) && !loc.getTypeIds().isEmpty()) {
+ join = StringUtils.join(loc.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.getTypeIds()) && !loc.getTypeIds().isEmpty(), 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())
@@ -75,10 +75,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R initLocs(LocMastInitParam param) {
+ public R initLocs(LocMastInitParam param, Long loginUserId) {
//娓呯┖琛�
- this.baseMapper.deleteAll();
-
+// this.baseMapper.deleteAll();
+ //娓呯┖褰撳墠搴撳尯搴撲綅
+ List<Loc> locs = this.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, param.getWarehouseId()).eq(Loc::getAreaId, param.getAreaId()));
+ if (!locs.isEmpty()) {
+ if (!this.remove(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, param.getWarehouseId()).eq(Loc::getAreaId, param.getAreaId()))) {
+ throw new CoolException("鍒濆鍖栧け璐ワ細鏁版嵁鍒犻櫎澶辫触锛侊紒");
+ }
+ }
WarehouseAreas warehouseAreas = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
.eq(WarehouseAreas::getWarehouseId, param.getWarehouseId())
.eq(WarehouseAreas::getId, param.getAreaId()));
@@ -87,12 +93,21 @@
}
String join = StringUtils.join(param.getTypeIds(), ",");
+ String[] split = warehouseAreas.getCode().split("\\.");
+ if (split.length == 0){
+ throw new CoolException("搴撳尯缂栫爜閿欒锛侊紒");
+ }
+ StringBuilder locStar = new StringBuilder();
+ for (int i = 0; i < split.length; i++) {
+ locStar.append(split[i]).append("-");
+ }
+
List<Loc> list = new ArrayList<>();
for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
// 鑾峰彇搴撲綅鍙�
- String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
+ String locNo = locStar + String.format("%d", r) + String.format("-%d", b) + String.format("-%d", l);
Loc loc = new Loc();
loc.setCode(locNo)
.setUseStatus("O")
@@ -101,14 +116,28 @@
.setLev(l)
.setType(join)
.setAreaId(param.getAreaId())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setWarehouseId(warehouseAreas.getWarehouseId());
list.add(loc);
}
}
}
+
if (!this.saveBatch(list)) {
throw new CoolException("搴撲綅鍒濆鍖栧け璐ワ紒锛�");
}
+ List<LocTypeRela> locTypeRelas = new ArrayList<>();
+ for (Long typeId : param.getTypeIds()) {
+ for (Loc loc : list) {
+ LocTypeRela typeRela = new LocTypeRela();
+ typeRela.setLocId(loc.getId()).setTypeId(typeId);
+ locTypeRelas.add(typeRela);
+ }
+ }
+ if (!locTypeRelaService.saveBatch(locTypeRelas)) {
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈澶辫触锛侊紒");
+ }
return R.ok("鍒濆鍖栨垚鍔燂紒锛�");
}
--
Gitblit v1.9.1