From b6222dd7f740ad57aef7e37774364e3c9c01cf7a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 24 五月 2025 15:51:30 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/work/outBound/OutBoundList.jsx | 9 ++++++++-
rsf-admin/src/i18n/zh.js | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 5 +++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index a637289..c374037 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -791,7 +791,7 @@
},
deviceSite: {
type: "鍏ュ嚭搴撶被鍨�",
- site: "鍏ュ簱鍙�",
+ site: "浣滀笟绔欑偣",
name: "鍚嶇О",
target: "鐩爣绔欑偣",
label: "绔欑偣鏍囩",
@@ -1162,7 +1162,7 @@
stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�",
select_error_order: "璇烽�夋嫨閫氱煡鍗�",
out_stock_qty: "鍑哄簱鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺",
-
+ qty_not_negative: "鏁伴噺涓嶈兘灏忎簬绛変簬0",
}
}
diff --git a/rsf-admin/src/page/work/outBound/OutBoundList.jsx b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
index 22aaa44..fda04e4 100644
--- a/rsf-admin/src/page/work/outBound/OutBoundList.jsx
+++ b/rsf-admin/src/page/work/outBound/OutBoundList.jsx
@@ -222,7 +222,8 @@
width: 100,
type: 'number',
editable: true,
- headerClassName: "custom",
+ headerClassName: "custom",
+
},
{
field: 'anfme',
@@ -315,6 +316,12 @@
const processRowUpdate = (newRow, oldRow) => {
+ // 纭繚outQty涓嶅皬浜�0
+ if (newRow.outQty <= 0) {
+ notify(translate('request.error.qty_not_negative'), { type: 'error', messageArgs: { _: translate('request.error.qty_not_negative') } });
+ return oldRow; // 濡傛灉灏忎簬0锛屼繚鎸佸師鍊间笉鍙�
+ }
+
const rows = tabelData.map((r) =>
r.id === newRow.id ? { ...newRow } : r
)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index b6b4eff..66cb207 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -84,8 +84,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
public InTaskMsgDto createInTask(TaskInParam param) {
- // 鑾峰彇搴撲綅鍙�
- InTaskMsgDto locNo = getLocNo(param);
// 楠岃瘉璁惧绔欑偣
DeviceSite deviceSite = validateDeviceSite(param);
@@ -96,6 +94,9 @@
// 鐢熸垚浠诲姟缂栫爜
String ruleCode = generateTaskCode();
+ // 鑾峰彇搴撲綅鍙�
+ InTaskMsgDto locNo = getLocNo(param);
+
// 鍒涘缓骞朵繚瀛樹换鍔�
Task task = createTask(ruleCode, locNo.getLocNo(), waitPakin.getBarcode(),
deviceSite.getDeviceSite(), param.getSourceStaNo().toString(), param.getUser());
--
Gitblit v1.9.1