From 1c54a6ae33a15cf0c426e1e9c7ae07398a1e65e5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 四月 2025 15:17:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 634b4f7..52264fc 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -422,7 +422,7 @@
             qlyInspect: {
                 asnId: "鏀惰揣閫氱煡鍗曞彿",
                 asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
-                code: "缂栫爜",
+                code: "璐ㄦ鍗曠紪鐮�",
                 wkType: "涓氬姟绫诲瀷",
                 safeQty: "鍚堟牸鏁伴噺",
                 dlyQty: "閫佽揣鏁伴噺",
@@ -432,7 +432,7 @@
             },
             qlyIsptItem: {
                 ispectId: "涓诲崟ID",
-                matnrCode: "缂栧彿",
+                matnrCode: "鐗╂枡缂栧彿",
                 maktx: "鐗╂枡鍚嶇О",
                 label: "鏍囩",
                 splrName: "渚涘簲鍟嗗悕绉�",
@@ -445,6 +445,7 @@
                 disQty: "涓嶅悎鏁伴噺",
                 safeQty: "鍚堟牸鏁伴噺",
                 picPath: "鍥剧墖璺緞",
+                trackCode: "鏉″舰鐮�",
             },
             dictType: {
                 code: "瀛楀吀缂栫爜",
@@ -520,7 +521,7 @@
                 poDetlCode: "PO鍗曠紪鐮�",
                 matnrId: "鐗╂枡鏍囪瘑",
                 maktx: "鐗╂枡鍚嶇О",
-                maktxCode: "鐗╂枡缂栫爜",
+                matnrCode: "鐗╂枡缂栫爜",
                 anfme: "鏁伴噺",
                 stockUnit: "搴撳瓨鍗曚綅",
                 purQty: "璁″垝鏀惰揣鏁伴噺",
@@ -795,6 +796,9 @@
         siteInit: '绔欑偣鍒濆鍖�',
         batch: '鎵归噺鎿嶄綔',
         confirm: '纭',
+        cancel: "鍙栨秷",
+        top: "缃《",
+        resort: "鎺掑簭",
         subzone: '缁戝畾鍒嗗尯',
         bindmatnr: '缁戝畾鐗╂枡',
         bindloc: '缁戝畾搴撲綅',

--
Gitblit v1.9.1