From 4cf43750c41e1833143b557ecbbf6844656f49d6 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期四, 09 四月 2026 17:04:01 +0800
Subject: [PATCH] 添加成品库存详细页面物料条码字段
---
项目代码/WMS/WMSClient/src/services/taskTimeout.js | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/services/taskTimeout.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/services/taskTimeout.js"
index a56394b..b9ed402 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/services/taskTimeout.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/services/taskTimeout.js"
@@ -92,21 +92,19 @@
const globalObj = window.$global || {};
// 澶勭悊娑堟伅鍒犻櫎閫昏緫锛岄噸缃搴斾换鍔＄殑瀹氭椂鍣�
- const deletedMessages = globalObj.messageDeleted || [];
+ const deletedMessages = [...(globalObj.messageDeleted || [])];
if (deletedMessages.length > 0) {
- const globalMessageList = globalObj.messageList || [];
-
+ // 娓呯┖宸插鐞嗙殑鍒犻櫎娑堟伅鍒楄〃锛岄伩鍏嶉噸澶嶅鐞�
+ globalObj.messageDeleted = [];
+
// 閬嶅巻琚垹闄ょ殑娑堟伅ID锛岄噸缃搴斾换鍔＄殑瀹氭椂鍣�
deletedMessages.forEach(deletedId => {
- const deletedMessage = globalMessageList.find(msg => msg.id === deletedId);
- if (deletedMessage?.businessType === 'task_timeout' && deletedMessage.taskNum && this.taskStatusMap[deletedMessage.taskNum]) {
- this.taskStatusMap[deletedMessage.taskNum] = now;
- }
+ // 涓嶉渶瑕佷粠messageList涓煡鎵撅紝鍥犱负娑堟伅宸茬粡琚垹闄�
+ // 鐩存帴澶勭悊浠诲姟鐘舵�侀噸缃�
+ // 杩欓噷涓嶅仛浠讳綍鎿嶄綔锛屽洜涓烘秷鎭垹闄ゆ槸鐢ㄦ埛涓诲姩琛屼负
+ // 鎴戜滑鍙渶瑕佹竻绌簃essageDeleted鏁扮粍鍗冲彲
});
-
- // 娓呯┖宸插鐞嗙殑鍒犻櫎娑堟伅鍒楄〃
- globalObj.messageDeleted = [];
}
// 鑾峰彇褰撳墠鎵�鏈変换鍔″彿鍜岀姸鎬�
@@ -145,7 +143,7 @@
const globalObj = window.$global || {};
// 鑾峰彇鍏ㄥ眬娑堟伅鍒楄〃
- const globalMessageList = globalObj.messageList || [];
+ const globalMessageList = [...(globalObj.messageList || [])];
// 鎵惧嚭闇�瑕佹竻闄ょ殑浠诲姟瓒呮椂娑堟伅
const taskTimeoutMessages = globalMessageList.filter(msg => msg.businessType === 'task_timeout');
@@ -156,32 +154,29 @@
// 妫�鏌ユ潯浠讹細
// 1. 浠诲姟涓嶅湪褰撳墠浠诲姟鍒楄〃涓紙宸插畬鎴愭垨琚Щ闄わ級
// 2. 浠诲姟鍦ㄥ綋鍓嶄换鍔″垪琛ㄤ腑锛屼絾鐘舵�佸凡涓嶅啀鏄爢鍨涙満鎵ц涓�
- if (!currentTaskStatuses[taskNum] || currentTaskStatuses[taskNum] !== 210) {
+ if (taskNum && (!currentTaskStatuses[taskNum] || currentTaskStatuses[taskNum] !== 210)) {
// 浠诲姟宸插畬鎴愭垨鐘舵�佸凡鏀瑰彉锛屾竻闄よ娑堟伅
- this.handleDeleteTaskMessage(msg);
+ // 浣嗚纭繚鍙湪娑堟伅浠嶇劧瀛樺湪鏃舵墠鍒犻櫎
+ if (globalObj.messageList && Array.isArray(globalObj.messageList)) {
+ const index = globalObj.messageList.findIndex(m => m.id === msg.id);
+ if (index !== -1) {
+ globalObj.messageList.splice(index, 1);
+ }
+ }
}
});
}
- // 澶勭悊鍒犻櫎鍗曚釜浠诲姟娑堟伅
- handleDeleteTaskMessage(message) {
- // 鑾峰彇鍏ㄥ眬瀵硅薄
- const globalObj = window.$global || {};
- // 鐩存帴浠庡叏灞�娑堟伅鍒楄〃涓垹闄よ娑堟伅
- if (globalObj.messageList) {
- const index = globalObj.messageList.findIndex(msg => msg.id === message.id);
- if (index !== -1) {
- globalObj.messageList.splice(index, 1);
- }
- }
- }
// 鍙戦�佷换鍔¤鍛婃秷鎭�
sendTaskWarningMessage(task, duration) {
+ // 鍒涘缓鍞竴鐨勬秷鎭疘D
+ const messageId = Date.now() + Math.random().toString(36).substr(2, 9);
+
// 鍒涘缓璀﹀憡娑堟伅
const warningMessage = {
- id: Date.now(),
+ id: messageId,
title: '浠诲姟寮傚父璀﹀憡',
message: `浠诲姟鍙� ${task.taskNum} 宸插湪鍫嗗灈鏈烘墽琛屼腑鐘舵�佽秴杩�${Math.round(duration)}鍒嗛挓锛岃鍙婃椂澶勭悊锛乣,
type: 'warning',
@@ -206,7 +201,6 @@
try {
if (globalObj.messageList) {
globalObj.messageList.push(warningMessage);
-
}
} catch (error) {
// 鍑洪敊鏃朵娇鐢ㄦ祻瑙堝櫒鍘熺敓alert浣滀负鏈�缁堝閫�
--
Gitblit v1.9.3