From da15785661f7832cdcb78fb6504752c0cb385e63 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 09:59:13 +0800
Subject: [PATCH] 入库数量变更
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 20 ++++++++--
rsf-admin/src/layout/TabsBar.jsx | 60 ++++++++++++++++++++----------
rsf-admin/src/layout/index.jsx | 2
3 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/rsf-admin/src/layout/TabsBar.jsx b/rsf-admin/src/layout/TabsBar.jsx
index cf1d663..3043ade 100644
--- a/rsf-admin/src/layout/TabsBar.jsx
+++ b/rsf-admin/src/layout/TabsBar.jsx
@@ -405,24 +405,24 @@
};
// 鍒ゆ柇鎸囧畾鏍囩椤垫槸鍚﹀彲浠ュ叧闂乏渚ф爣绛�
- // const canCloseLeftForTab = (tabPath) => {
- // const tabIndex = tabs.findIndex(tab => tab.path === tabPath);
- // if (tabIndex <= 0) {
- // return false; // 娌℃湁宸︿晶鏍囩鎴栬繖鏄涓�涓爣绛�
- // }
- // // 妫�鏌ュ乏渚ф槸鍚︽湁鍙叧闂殑鏍囩锛堟帓闄ashboard锛�
- // return tabs.slice(0, tabIndex).some(tab => tab.closable);
- // };
+ const canCloseLeftForTab = (tabPath) => {
+ const tabIndex = tabs.findIndex(tab => tab.path === tabPath || isSameResource(tab.path, tabPath));
+ if (tabIndex <= 0) {
+ return false; // 娌℃湁宸︿晶鏍囩鎴栬繖鏄涓�涓爣绛�
+ }
+ // 妫�鏌ュ乏渚ф槸鍚︽湁鍙叧闂殑鏍囩锛堟帓闄ashboard锛�
+ return tabs.slice(0, tabIndex).some(tab => tab.closable);
+ };
// 鍒ゆ柇鎸囧畾鏍囩椤垫槸鍚﹀彲浠ュ叧闂彸渚ф爣绛�
- // const canCloseRightForTab = (tabPath) => {
- // const tabIndex = tabs.findIndex(tab => tab.path === tabPath);
- // if (tabIndex < 0 || tabIndex >= tabs.length - 1) {
- // return false; // 娌℃湁鍙充晶鏍囩鎴栬繖鏄渶鍚庝竴涓爣绛�
- // }
- // // 妫�鏌ュ彸渚ф槸鍚︽湁鍙叧闂殑鏍囩
- // return tabs.slice(tabIndex + 1).some(tab => tab.closable);
- // };
+ const canCloseRightForTab = (tabPath) => {
+ const tabIndex = tabs.findIndex(tab => tab.path === tabPath || isSameResource(tab.path, tabPath));
+ if (tabIndex < 0 || tabIndex >= tabs.length - 1) {
+ return false; // 娌℃湁鍙充晶鏍囩鎴栬繖鏄渶鍚庝竴涓爣绛�
+ }
+ // 妫�鏌ュ彸渚ф槸鍚︽湁鍙叧闂殑鏍囩
+ return tabs.slice(tabIndex + 1).some(tab => tab.closable);
+ };
return (
<Box
@@ -481,16 +481,18 @@
display: 'inline-flex',
alignItems: 'center',
justifyContent: 'center',
- p: 0.25,
+ p: 0.35,
ml: 0.5,
borderRadius: '50%',
cursor: 'pointer',
+ color: 'inherit',
'&:hover': {
backgroundColor: 'rgba(0, 0, 0, 0.1)',
+ color: '#d32f2f',
},
}}
>
- <CloseIcon sx={{ fontSize: 14 }} />
+ <CloseIcon sx={{ fontSize: 16 }} />
</Box>
</Tooltip>
)}
@@ -562,6 +564,7 @@
sx: { py: 0 },
}}
>
+ {/* 鍏抽棴褰撳墠鏍囩
{contextMenuTab && contextMenuTab.closable && (
<MenuItem
onClick={handleCloseCurrentTab}
@@ -575,13 +578,30 @@
{t('ra.action.close', '鍏抽棴褰撳墠鏍囩')}
</MenuItem>
)}
+ */}
{contextMenuTab && canCloseLeftForTab(contextMenuTab.path) && (
- <MenuItem onClick={handleCloseLeftTabs}>
+ <MenuItem
+ onClick={handleCloseLeftTabs}
+ sx={{
+ fontSize: '0.8125rem',
+ py: 0.75,
+ px: 1.5,
+ minHeight: 'auto',
+ }}
+ >
{t('ra.action.closeLeft', '鍏抽棴宸︿晶鏍囩')}
</MenuItem>
)}
{contextMenuTab && canCloseRightForTab(contextMenuTab.path) && (
- <MenuItem onClick={handleCloseRightTabs}>
+ <MenuItem
+ onClick={handleCloseRightTabs}
+ sx={{
+ fontSize: '0.8125rem',
+ py: 0.75,
+ px: 1.5,
+ minHeight: 'auto',
+ }}
+ >
{t('ra.action.closeRight', '鍏抽棴鍙充晶鏍囩')}
</MenuItem>
)}
diff --git a/rsf-admin/src/layout/index.jsx b/rsf-admin/src/layout/index.jsx
index d8f17b8..d6ede1f 100644
--- a/rsf-admin/src/layout/index.jsx
+++ b/rsf-admin/src/layout/index.jsx
@@ -33,7 +33,7 @@
top: 48,
left: sidebarWidth + 5,
right: 0,
- zIndex: 1100,
+ zIndex: 1350, // 楂樹簬 Dialog(1300)锛岄伩鍏嶈彍鍗曞唴寮圭獥閬洊鏍囩椤�
transition: (theme) =>
theme.transitions.create('left', {
easing: theme.transitions.easing.sharp,
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 34bf4c5..8450c7e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -873,6 +873,9 @@
}
if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
locWorking.setAnfme(taskItem.getAnfme());
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) && taskItem.getQty() != null && taskItem.getQty().compareTo(0.0) > 0) {
+ // 鎷ｆ枡鍐嶅叆搴擄細鍏ュ簱鏁伴噺涓烘湰娆℃嫞鏂欐暟閲�(taskItem.qty)锛屼繚璇佷笌鍑哄簱鎵ｅ噺涓�鑷�
+ locWorking.setAnfme(taskItem.getQty());
}
BeanUtils.copyProperties(locWorking, locItem);
locItem.setWorkQty(0.0).setQty(0.0).setLocCode(loc.getCode()).setLocId(loc.getId()).setId(null).setUpdateBy(loginUserId).setUpdateTime(new Date());
@@ -1304,6 +1307,11 @@
throw new CoolException("鏁版嵁閿欒锛氫换鍔℃槑缁嗕负绌猴紒锛�");
}
+ // 鎷ｆ枡鍏ュ簱锛氬湪鐢熸垚鎷ｆ枡鍏ュ簱鍗曟椂鎵ｅ噺鍘熷簱浣嶆暟閲忥紝涓嶄緷璧栧嚭搴撳畬鎴愭椂搴撲綅鐘舵�佷负R
+ if (TaskType.TASK_TYPE_PICK_IN.type.equals(type)) {
+ subtractLocItemByTaskItems(loc, taskItems, SystemAuthUtils.getLoginUserId());
+ }
+
tempLocs.forEach(working -> {
taskItems.forEach(taskItem -> {
if (Objects.equals(taskItem.getFieldsIndex(), working.getFieldsIndex())) {
@@ -1376,6 +1384,10 @@
.setQty(0.0)
.setLocId(loc1.getId())
.setLocCode(loc1.getCode());
+ // 鎷ｆ枡鍐嶅叆搴擄細鐩爣搴撲綅鏁伴噺搴斾负鏈鎷ｆ枡鏁伴噺(taskItem.qty)锛屼笉鏄師搴撲綅鍓╀綑鏁伴噺(taskItem.anfme)
+ if (TaskType.TASK_TYPE_PICK_IN.type.equals(task.getTaskType()) && taskItem.getQty() != null && taskItem.getQty().compareTo(0.0) > 0) {
+ itemWorking.setAnfme(taskItem.getQty());
+ }
workings.add(itemWorking);
});
@@ -1431,10 +1443,10 @@
}
return; // 璺宠繃鍚庣画澶勭悊
} else {
- // 搴撲綅鏄庣粏涓嶄负绌轰絾鐘舵�佷笉鏄疪锛岃褰曢敊璇絾涓嶆姏鍑哄紓甯革紝璁╁畾鏃朵换鍔＄户缁鐞嗗叾浠栦换鍔�
+ // 搴撲綅鏄庣粏涓嶄负绌轰絾鐘舵�佷笉鏄疪锛岃烦杩囧鐞�
logger.error("浠诲姟{}鐨勫簱浣峽}鐘舵�佷负{}锛屼笉鏄疪.鍑哄簱棰勭害鐘舵�侊紝浣嗗簱浣嶆槑缁嗕笉涓虹┖锛岃烦杩囧鐞嗐�備换鍔＄紪鐮侊細{}锛屽簱浣嶇紪鐮侊細{}",
task.getId(), loc.getCode(), loc.getUseStatus(), task.getTaskCode(), loc.getCode());
- return; // 璺宠繃澶勭悊锛岄伩鍏嶅紓甯镐腑鏂畾鏃朵换鍔�
+ return;
}
}
@@ -1461,8 +1473,8 @@
if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
// 鍏ㄧ増鍑哄簱锛氫笉鍒犻櫎搴撲綅鏄庣粏锛岀瓑寰匬DA蹇�熸嫞璐х‘璁ゆ椂鍐嶅垹闄�
// subtractLocItem(loc); // 宸茬Щ闄わ紝鏀逛负鍦╟ompleteFullOutStock涓垹闄�
- } else {
- // 閮ㄥ垎鍑哄簱锛堝鎷ｆ枡鍑哄簱锛夛細鏍规嵁TaskItem鏁伴噺鎵ｅ噺搴撲綅鏄庣粏
+ } else if (!TaskType.TASK_TYPE_PICK_AGAIN_OUT.type.equals(task.getTaskType())) {
+ // 閮ㄥ垎鍑哄簱锛堝鐩樼偣鍑哄簱锛夛細鏍规嵁TaskItem鏁伴噺鎵ｅ噺搴撲綅鏄庣粏锛涙嫞鏂欏嚭搴撳湪鐢熸垚鎷ｆ枡鍏ュ簱鍗曟椂鎵ｅ噺
subtractLocItemByTaskItems(loc, taskItems, loginUserId);
}
} catch (Exception e) {
--
Gitblit v1.9.1