From c45c8ec6f41c9ad20abed43c7bc43ea99278faad Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 26 十二月 2025 11:00:32 +0800
Subject: [PATCH] 出库添加一键完结功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 fb2daf9..bf11e25 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
@@ -73,7 +73,7 @@
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getAreaId, loc.getAreaId())
- .eq(Loc::getChannel,loc.getChannel())
+ .eq(!Objects.isNull(loc.getChannel()), Loc::getChannel,loc.getChannel())
.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
);
List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
@@ -127,10 +127,13 @@
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
String join = StringUtils.join(loc.getTypeIds(), ",");
- loc.setType(join);
- if (Objects.isNull(loc.getTypeIds())) {
- throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ if (!Objects.isNull(loc.getTypeIds())) {
+ loc.setType(join);
}
+ if (Objects.isNull(loc.getTypeIds()) && !Objects.isNull(loc.getType())) {
+ loc.setTypeIds(Arrays.asList(Long.valueOf(loc.getType())));
+ }
+
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
--
Gitblit v1.9.1