From 1b5a58ec0da1ae8eb40a66e41dcd23bb7c2b2e94 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 17:39:33 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index a6268e0..c19a91a 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -157,6 +157,8 @@
         waitPakinItemLog: '缁勬嫋鍘嗗彶妗f槑缁�',
         task: '浠诲姟宸ヤ綔妗�',
         taskItem: '浠诲姟妗f槑缁�',
+        taskLog: '浠诲姟鍘嗗彶妗�',
+        taskItemLog: '浠诲姟鏄庣粏鍘嗗彶妗�',
     },
     table: {
         field: {
@@ -694,15 +696,50 @@
                 startTime: "寮�濮嬫椂闂�",
                 endTime: "缁撴潫鏃堕棿",
             },
+            taskLog: {
+                taskId: "浠诲姟ID",
+                taskCode: "浠诲姟鍙�",
+                taskStatus: "鐘舵��",
+                taskType: "绫诲瀷",
+                orgLoc: "婧愬簱浣�",
+                orgSite: "婧愮珯鐐�",
+                targLoc: "鐩爣搴撲綅",
+                targSite: "鐩爣绔欑偣",
+                barcode: "鎷栫洏鐮�",
+                robotCode: "鏈哄櫒缂栫爜",
+                exceStatus: "鎵ц鐘舵��",
+                expDesc: "寮傚父璇存槑",
+                sort: "浼樺厛绾�",
+                expCode: "寮傚父缂栫爜",
+                startTime: "寮�濮嬫椂闂�",
+                endTime: "缁撴潫鏃堕棿",
+            },
             taskItem: {
                 taskId: "taskId",
                 orderId: "璁㈠崟ID",
                 orderType: "鍗曟嵁绫诲瀷",
                 orderItemId: "璁㈠崟鏄庣粏ID",
-                sourceCode: "璁㈠崟鍙�",
+                source: "婧怚D",
                 matnrId: "鐗╂枡ID",
                 maktx: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
+                unit: "鍗曚綅",
+                anfme: "鏁伴噺",
+                batch: "鎵规",
+                spec: "瑙勬牸",
+                model: "鍨嬪彿",
+            },
+            taskItemLog: {
+                taskItemId: "taskItemId",
+                taskId: "taskId",
+                orderId: "璁㈠崟ID",
+                orderType: "鍗曟嵁绫诲瀷",
+                orderItemId: "璁㈠崟鏄庣粏ID",
+                source: "婧怚D",
+                matnrId: "鐗╂枡ID",
+                maktx: "鐗╂枡鍚嶇О",
+                matnrCode: "鐗╂枡缂栫爜",
+                trackCode: "璺熻釜鐮�",
                 unit: "鍗曚綅",
                 anfme: "鏁伴噺",
                 batch: "鎵规",
@@ -816,6 +853,7 @@
         complete: "瀹屾垚",
         close: "鍏抽棴",
         asnCreate: "閫氳繃ASN鍒涘缓",
+        createTask: "鐢熸垚浠诲姟",
     },
 };
 

--
Gitblit v1.9.1