From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |  100 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index b98d8cf..e36c5af 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -97,6 +97,7 @@
                 tip: '鎻愮ず',
                 desc: '鎮ㄧ‘瀹氳鎵ц姝ゆ搷浣滃悧锛�',
             },
+            locEmpty: '璇烽�夋嫨鐩樼偣搴撲綅',
             placeholder: '璇疯緭鍏ユ悳绱㈠唴瀹�',
         },
         aside: {
@@ -191,7 +192,7 @@
         taskItemLog: '浠诲姟鏄庣粏鍘嗗彶妗�',
         stock: '鍏ュ嚭搴撳巻鍙�',
         stockItem: '鍗曟嵁鏄庣粏',
-        locItem: '搴撲綅鏄庣粏',
+        locPreview: '搴撲綅鏄庣粏',
         histories: '鍘嗗彶妗�',
         wareWork: '浠撳簱浣滀笟',
         statistics: '搴撳瓨鏌ヨ',
@@ -214,13 +215,19 @@
         stockTransfer: '搴撲綅杞Щ',
         waveRule: '娉㈡绛栫暐',
         checkOrder: '鐩樼偣鍗�',
+        checkDiff: '鐩樼偣宸紓鍗�',
+        transfer: '璋冩嫈鍗�',
+        transferItem: '璋冩嫈鍗曟槑缁�',
+        locRevise: '搴撳瓨璋冩暣',
     },
     table: {
         field: {
             stockTransfer: {
                 orgLoc: '婧愬簱浣�',
                 tarLoc: '鐩爣搴撲綅',
-                inputLoc: '杈撳叆搴撲綅'
+                inputLoc: '杈撳叆搴撲綅',
+                inputChannel: '杈撳叆宸烽亾'
+
             },
             outBound: {
                 stockWithdrawal: '鎻愬彇搴撳瓨',
@@ -639,8 +646,8 @@
                 type: "鍗曟嵁绫诲瀷",
                 checkType: '鐩樼偣绫诲瀷',
                 wkType: "涓氬姟绫诲瀷",
-                anfme: "鏁伴噺",
-                workQty: '鎵ц鏁�',
+                anfme: "璁″垝鐩樼偣鏁伴噺",
+                workQty: '瀹炵洏鏁伴噺',
                 qty: "瀹屾垚鏁�",
                 logisNo: "鐗╂祦鍗曞彿",
                 arrTime: "棰勮鍒拌揪鏃堕棿",
@@ -648,6 +655,7 @@
                 ntyStatus: "涓婃姤鐘舵��",
                 exceStatus: '鎵ц鐘舵��'
             },
+
             checkOrderItem: {
                 orderId: "涓诲崟鏍囪瘑",
                 orderCode: "鍗曞彿",
@@ -669,6 +677,76 @@
                 splrName: "渚涘簲鍟�",
                 qrcode: "浜岀淮鐮�",
                 barcode: "搴忓垪鐮�",
+            },
+
+            checkDiff: {
+                orderCode: "鐩樼偣鍗�",
+                checkType: "鐩樼偣绫诲瀷",
+                areaId: "搴撳尯ID",
+                areaName: "搴撳尯",
+                anfme: "搴撳瓨鏁伴噺",
+                checkQty: "鐩樼偣鏁伴噺",
+                exceStatus: "鎵ц鐘舵��",
+            },
+            transfer: {
+                code: "璋冩嫈鍗�",
+                type: "璋冩嫈绫诲瀷",
+                source: "鍗曟嵁鏉ユ簮",
+                exceStatus: "鎵ц鐘舵��",
+                orgWareId: "鍘熶粨搴揑D",
+                orgWareName: "鍘熶粨搴�",
+                tarWareId: "鐩爣浠撳簱ID",
+                tarWareName: "鐩爣浠撳簱",
+                orgAreaId: "鍘熷簱鍖篒D",
+                orgAreaName: "鍘熷簱鍖�",
+                tarAreaId: "鐩爣搴撳尯",
+                tarAreaName: "鐩爣搴撳尯",
+            },
+
+            transferItem: {
+                transferId: "璋冩嫈鍗旾D",
+                transferCode: "璋冩嫈鍗�",
+                matnrId: "鐗╂枡ID",
+                maktx: "鐗╂枡鍚嶇О",
+                matnrCode: "鐗╂枡缂栫爜",
+                unit: "鍗曚綅",
+                anfme: "鏁伴噺",
+                qty: "瀹屾垚鏁伴噺",
+                workQty: "鎵ц鏁伴噺",
+                batch: "鎵规",
+                splrId: "渚涘簲鍟�",
+                spec: "瑙勬牸",
+                model: "鍨嬪彿",
+                fieldsIndex: "瀛楁绱㈠紩",
+                platOrderCode: "瀹㈠崟鍙�",
+                platWorkCode: "宸ュ崟鍙�",
+                projectCode: "椤圭洰鍗曞彿",
+            },
+
+            transferOrder: {
+                code: '鍗曞彿',
+                poCode: '璋冩嫈鍗�',
+                type: '鍗曟嵁绫诲瀷',
+                wkType: '璋冩嫈绫诲瀷',
+                anfme: '璋冩嫈鏁伴噺',
+                workQty: '鎵ц鏁伴噺',
+                qty: '瀹屾垚鏁�',
+            },
+
+            checkDiffItem: {
+                checkId: "鐩樼偣鍗旾D",
+                orderCode: "鐩樼偣鍗曞彿",
+                maktx: "鐗╂枡鍚嶇О",
+                matnrCode: "鐗╂枡缂栫爜",
+                spec: "瑙勬牸",
+                model: "鍨嬪彿",
+                barcode: "鎵樼洏鐮�",
+                batch: "鎵规",
+                anfme: "搴撳瓨鏁伴噺",
+                checkQty: "瀹炵洏鏁伴噺",
+                diffQty: '宸紓鏁伴噺',
+                exceStatus: "鎵ц鐘舵��",
+                reason: "宸紓鍘熷洜",
             },
             asnOrderItem: {
                 orderId: "涓诲崟鏍囪瘑",
@@ -861,6 +939,16 @@
                 anfme: "鏁伴噺",
                 ioStatus: "鐘舵��",
             },
+            locRevise: {
+                code: "璋冩暣鍗�",
+                type: "璋冩暣绫诲瀷",
+                anfme: "搴撳瓨鏁伴噺",
+                reviseQty: "瀹為檯鏁伴噺",
+                exceStatus: "鎵ц鐘舵��",
+                areaId: "搴撳尯ID",
+                areaName: "搴撳尯",
+                exceTime: "璋冩暣鏃堕棿",
+            },
             waitPakinItem: {
                 pakinId: "缁勬墭Id",
                 maktx: "鐗╂枡",
@@ -984,6 +1072,7 @@
                 batch: "鎵规",
                 spec: "瑙勬牸",
                 model: "鍨嬪彿",
+                sourceCode: "婧愬崟鎹�",
             },
             taskItemLog: {
                 taskItemId: "taskItemId",
@@ -1192,6 +1281,7 @@
         selectSite: '閫夋嫨绔欑偣',
         confirmSelect: '纭閫夋嫨',
         cancel: "鍙栨秷",
+        delete: '鍒犻櫎',
         query: "鏌ヨ",
         top: "缃《",
         resort: "鎺掑簭",
@@ -1213,6 +1303,8 @@
         quality: "璐ㄦ",
         complete: "瀹岀粨",
         close: "鍏抽棴",
+        createTransfer: '鍒涘缓璋冩嫈鍗�',
+        createLocRevise: '鍒涘缓搴撳瓨璋冩暣鍗�',
         asnCreate: "閫氳繃鍗曟嵁鍒涘缓",
         poCreate: "閫氳繃PO鍗曞垱寤�",
         orderPrint: '鎵撳嵃鍗曟嵁',

--
Gitblit v1.9.1