From bd5e2cf6bc93e927708d5dacf60cc576f7bf48cc Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 26 五月 2025 13:48:07 +0800 Subject: [PATCH] 移库功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 4 +++- rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx index 4a16266..66e82eb 100644 --- a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx +++ b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx @@ -221,10 +221,10 @@ notify("璇疯緭鍏ユ簮搴撲綅"); return; } - if (tarLoc === "" || tarLoc === undefined || tarLoc === null) { - notify("璇疯緭鍏ョ洰鏍囧簱浣�"); - return; - } + // if (tarLoc === "" || tarLoc === undefined || tarLoc === null) { + // notify("璇疯緭鍏ョ洰鏍囧簱浣�"); + // return; + // } if (tabelData.length === 0) { notify("婧愬簱浣嶆槑缁嗘棤锛岃妫�鏌ュ簱浣嶇姸鎬�"); return; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java index d817edc..fa79c4c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java @@ -218,7 +218,9 @@ Loc targetLoc = new Loc(); if (Objects.isNull(map.get("tarLoc")) || StringUtils.isBlank(map.get("tarLoc").toString())) { //鐩爣搴撲綅涓虹┖锛岃嚜鍔ㄨ幏鍙栨柊搴撲綅 - DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getChannel, orgLoc.getChannel()), false); + DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>() + .eq(DeviceSite::getType, TaskType.TASK_TYPE_LOC_MOVE.type) + .eq(DeviceSite::getChannel, orgLoc.getChannel()), false); if (Objects.isNull(deviceSite)) { throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦紒锛�"); } -- Gitblit v1.9.1