From 183d1e50c7b9a040e39eec36de81e5331aa7b31c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 08:58:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 eb7a072..83f134d 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;
@@ -12,16 +11,14 @@
import com.vincent.rsf.server.manager.mapper.LocTypeRelaMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
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 {
@@ -52,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())
@@ -74,7 +75,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R initLocs(LocMastInitParam param) {
+ public R initLocs(LocMastInitParam param, Long loginUserId) {
//娓呯┖琛�
this.baseMapper.deleteAll();
@@ -84,6 +85,8 @@
if (Objects.isNull(warehouseAreas)) {
throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
}
+ String join = StringUtils.join(param.getTypeIds(), ",");
+
List<Loc> list = new ArrayList<>();
for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
@@ -96,9 +99,11 @@
.setRow(r)
.setCol(b)
.setLev(l)
+ .setType(join)
.setAreaId(param.getAreaId())
- .setWarehouseId(warehouseAreas.getWarehouseId())
- .setType(param.getType());
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setWarehouseId(warehouseAreas.getWarehouseId());
list.add(loc);
}
}
--
Gitblit v1.9.1