From 91831843f3b9fa4c9f29e518e10dae5d3f9aead8 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 10:40:51 +0800
Subject: [PATCH] 增加几种出入库单类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 86cb80e..e4b00ce 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
@@ -25,7 +25,9 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
@Service("locService")
@@ -50,13 +52,24 @@
@Override
public R modifyLocs(LocModifyParams locs) {
- if (locs.getId().isEmpty()) {
+ if (Objects.isNull(locs.getId()) || locs.getId().isEmpty()) {
throw new CoolException("搴撲綅ID涓嶈兘涓虹┖锛侊紒");
}
Loc loc = locs.getLoc();
if (Objects.isNull(loc)) {
throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒");
+ }
+ // 鍏煎鏃ц姹備腑鐨勭姸鎬佺鐢ㄥ弬鏁�
+ if (Objects.equals(loc.getStatus(), 0) && Objects.isNull(loc.getUseStatus())) {
+ loc.setUseStatus("X");
+ // loc.setStatus(0);
+ loc.setStatus(null);
+ }
+
+ List<Loc> exists = this.list(new LambdaQueryWrapper<Loc>().in(Loc::getId, locs.getId()));
+ if (exists.isEmpty()) {
+ throw new CoolException("鏈壘鍒板彲淇敼鐨勫簱浣嶄俊鎭紒锛�");
}
String join = loc.getType();
@@ -65,7 +78,7 @@
}
boolean update = this.update(new LambdaUpdateWrapper<Loc>()
.in(Loc::getId, locs.getId())
- .eq(Loc::getStatus, 1)
+ // .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())
@@ -77,7 +90,8 @@
.set(!Objects.isNull(loc.getFlagLabelMange()), Loc::getFlagLabelMange, loc.getFlagLabelMange())
.set(!Objects.isNull(loc.getStatus()), Loc::getStatus, loc.getStatus()));
if (!update) {
- throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
+ // 鏃犳暟鎹彉鏇存椂鎸夋垚鍔熻繑鍥烇紝閬垮厤閲嶅鎿嶄綔鎶ラ敊
+ return R.ok(loc);
}
return R.ok(loc);
@@ -244,6 +258,11 @@
*/
@Override
public IPage<LocStockDto> getLocDetls(Page<Object> page) {
- return this.baseMapper.getLocDetls(page);
+ return getLocDetls(page, null);
+ }
+
+ @Override
+ public IPage<LocStockDto> getLocDetls(Page<Object> page, Map<String, Object> conds) {
+ return this.baseMapper.getLocDetls(page, conds == null ? Collections.emptyMap() : conds);
}
}
--
Gitblit v1.9.1