From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/zh.js |  268 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 222 insertions(+), 46 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index c2430d1..0fabcf6 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -24,6 +24,10 @@
             memoWrap: '鏄剧ず澶囨敞',
             memo: '澶囨敞',
             opt: '鎿嶄綔',
+            supplier: '渚涘簲鍟�',
+            customer: '瀹㈡埛',
+            shipper: '璐т富',
+            partners: '鎴樼暐鍚堜綔',
         },
         list: {
             empty: {
@@ -51,12 +55,15 @@
             before: '缁撴潫鏃堕棿'
         },
         action: {
+            search: '鎼滅储',
             reset: '閲嶇疆',
             expand: '灞曞紑',
             expandAll: '鍏ㄩ儴灞曞紑',
             collapse: '鎶樺彔',
+            newAddMats: '鏂板鐗╂枡',
             collapseAll: '鍏ㄩ儴鎶樺彔',
             scope: '鏉冮檺',
+            inputPlaceholder: '绔欑偣鍙~澶氫釜锛屼腑闂翠互鑻辨枃閫楀彿鍖哄垎锛�,锛�',
             import: {
                 title: '瀵煎叆',
                 stop: '鍋滄瀵煎叆',
@@ -69,9 +76,12 @@
             loadMore: '鍔犺浇鏇村',
             complete: '瀹屾垚',
             deprecate: '搴熷純',
+            stockError: '娌℃湁搴撳瓨',
             resend: '閲嶅彂',
             selected: '椤归�変腑',
-            batch: '鎵归噺缂栬緫'
+            batch: '鎵归噺缂栬緫',
+            batchSafe: '鎵归噺鍚堟牸',
+            batchDef: '鎵归噺涓嶅悎鏍�',
         },
         msg: {
             confirm: {
@@ -130,12 +140,12 @@
         warehouse: '浠撳簱',
         warehouseAreas: '搴撳尯',
         loc: '搴撲綅',
-        locType: '搴撲綅绫诲瀷',
-        locArea: '閫昏緫鍒嗗尯',
-        locAreaMat: '閫昏緫鍒嗗尯',
+        locType: '搴撲綅绫诲瀷(搴�)',
+        locArea: '閫昏緫鍒嗗尯(搴�)',
+        locAreaMat: '閫昏緫鍒嗗尯(搴�)',
         locAreaMatRela: '搴撳尯鐗╂枡鍏崇郴',
-        container: '瀹瑰櫒绠$悊',
-        contract: '鍚堝悓淇℃伅',
+        container: '瀹瑰櫒绠$悊(搴�)',
+        contract: '鍚堝悓淇℃伅(搴�)',
         qlyInspect: '璐ㄦ淇℃伅',
         qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
         dictType: '鏁版嵁瀛楀吀',
@@ -152,23 +162,52 @@
         whMat: '搴撳尯鐗╂枡鍏崇郴',
         fields: '鎵╁睍瀛楁',
         fieldsItem: '鎵╁睍瀛楁鏄庣粏',
-        warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
-        deviceSite: '绔欑偣绠$悊',
-        waitPakin: '缁勬嫋閫氱煡妗�',
-        waitPakinItem: '缁勬嫋妗f槑缁�',
-        waitPakinLog: '缁勬嫋鍘嗗彶妗�',
-        waitPakinItemLog: '缁勬嫋鍘嗗彶妗f槑缁�',
-        task: '浠诲姟宸ヤ綔妗�',
+        warehouseAreasItem: '鏀惰揣搴撳瓨',
+        deviceSite: '璺緞绠$悊',
+        waitPakin: '缁勬墭閫氱煡妗�',
+        waitPakinItem: '缁勬墭妗f槑缁�',
+        waitPakinLog: '缁勬墭鍘嗗彶妗�',
+        waitPakinItemLog: '缁勬墭鍘嗗彶妗f槑缁�',
+        task: '浠诲姟绠$悊',
         taskItem: '浠诲姟妗f槑缁�',
         taskLog: '浠诲姟鍘嗗彶妗�',
         taskItemLog: '浠诲姟鏄庣粏鍘嗗彶妗�',
-        stock: '缁煎悎鍗曟嵁绠$悊',
+        stock: '鍏ュ嚭搴撳瓨淇℃伅',
         stockItem: '鍗曟嵁鏄庣粏',
-        locItem: 'LocItem',
-
+        locItem: '搴撲綅鏄庣粏',
+        histories: '鍘嗗彶妗�',
+        wareWork: '浠撳簱浣滀笟',
+        statistics: '搴撳瓨鏌ヨ',
+        stockManage: '搴撳瓨绠$悊',
+        logs: '鏃ュ織',
+        permissions: '鏉冮檺绠$悊',
+        delivery: 'DO鍗�',
+        outStock: '鍑哄簱鍗�',
+        outStockItem: '鍑哄簱鍗曟槑缁�',
+        inStockPoces: '鍏ュ簱绠$悊',
+        outStockPoces: '鍑哄簱绠$悊',
+        deviceBind: '璁惧缁戝畾',
+        tasks: '浠诲姟绠$悊',
+        wave: '娉㈡绠$悊',
+        basStation: '绔欑偣淇℃伅'
     },
-    table: {
+    table: {        
         field: {
+            basStation: {
+                stationName: '绔欑偣鍚嶇О',
+                inAble: '鑳藉叆',
+                outAble: '鑳藉嚭',
+                useStatus: '鐘舵��',
+                status: '鐘舵��',
+                area: '鎵�灞炲簱鍖虹被鍨�',
+                isCrossZone: '鏄惁璺ㄥ尯',
+                crossZoneArea: '鍙法鍖虹被鍨�',
+                isWcs: '鏄惁WCS绔欑珯鐐�',
+                wcsData: 'wcs鏁版嵁',
+                containerType: '瀹瑰櫒绫诲瀷',
+                barcode: '鏉$爜',  
+                autoTransfer: '鑷姩璋冩嫧',          
+            },
             host: {
 
             },
@@ -321,6 +360,7 @@
             warehouseAreas: {
                 uuid: "鍞竴缂栫爜",
                 name: "搴撳尯鍚嶇О",
+                type: "搴撳尯绫诲瀷",
                 wareId: "鎵�灞炰粨搴�",
                 code: "搴撳尯缂栫爜",
                 shipperId: "璐т富",
@@ -330,13 +370,17 @@
                 flagMix: "娣锋斁",
             },
             warehouseAreasItem: {
-                areaId: "浠撳簱鍖哄煙",
-                areaName: "鍖哄煙鍚嶇О	",
+                asnCode: '鍗曞彿',
+                areaId: "搴撳尯ID",
+                areaName: "搴撳尯鍚嶇О	",
                 matnrId: "鐗╂枡鏍囪瘑",
                 matnrName: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
                 fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+                workQty: '涓婃灦涓�',
+                qty: '宸插畬鎴�',
                 barcode: "鏉″舰鐮�",
+                isptResult: '璐ㄦ鐘舵��',
                 anfme: "鏁伴噺",
                 batch: "鎵规鍙�",
                 unit: "璁¢噺鍗曚綅",
@@ -351,8 +395,8 @@
             loc: {
                 warehouseId: "鎵�灞炰粨搴�",
                 areaId: "鎵�灞炲簱鍖�",
-                code: "搴撲綅缂栫爜",
-                type: "搴撲綅绫诲瀷",
+                code: "缂栫爜",
+                type: "绫诲瀷",
                 name: "鍚嶇О",
                 flagLogic: "铏氭嫙搴撲綅",
                 fucAtrrs: "鍔熻兘灞炴��",
@@ -442,18 +486,19 @@
             },
             qlyIsptItem: {
                 ispectId: "涓诲崟ID",
-                matnrCode: "鐗╂枡缂栧彿",
+                matnrCode: "鐗╂枡缂栫爜",
                 maktx: "鐗╂枡鍚嶇О",
                 label: "鏍囩",
-                splrName: "渚涘簲鍟嗗悕绉�",
-                splrBatch: "渚涘簲鍟嗘壒娆�",
+                splrName: "渚涘簲鍟�",
+                splrBatch: "鎵规",
                 stockBatch: "搴撳瓨鎵规",
                 isptResult: '璐ㄦ缁撹',
                 isptStatus: '璐ㄦ鐘舵��',
-                rcptQty: "鏀惰揣鏁伴噺",
+                rcptQty: "鍙鏁伴噺",
                 dlyQty: "閫佽揣鏁伴噺",
                 disQty: "涓嶅悎鏁伴噺",
                 safeQty: "鍚堟牸鏁伴噺",
+                anfme: '宸叉鏁伴噺',
                 picPath: "鍥剧墖璺緞",
                 trackCode: "鏉″舰鐮�",
             },
@@ -465,6 +510,7 @@
             dictData: {
                 dictTypeId: "瀛楀吀鏍囪瘑",
                 dictTypeCode: "瀛楀吀缂栫爜",
+                group: "鍒嗙被",
                 value: "鍊�",
                 label: "鍒悕",
                 sort: "鎺掑簭",
@@ -515,10 +561,24 @@
                 code: "ASN鍗曞彿",
                 poCode: "PO缂栫爜",
                 poId: "PO鏍囪瘑",
+                type: "鍗曟嵁绫诲瀷",
+                wkType: "涓氬姟绫诲瀷",
+                anfme: "璁″垝鏁伴噺",
+                qty: "瀹屾垚鏁伴噺",
+                logisNo: "鐗╂祦鍗曞彿",
+                arrTime: "棰勮鍒拌揪鏃堕棿",
+                rleStatus: "閲婃斁鐘舵��",
+                ntyStatus: "涓婃姤鐘舵��",
+                exceStatus: '鍗曟嵁鐘舵��'
+            },
+            outStock: {
+                code: "鍑哄簱鍗曞彿",
+                poCode: "骞冲彴鍗曞彿",
+                poId: "PO鏍囪瘑",
                 type: "绫诲瀷",
                 wkType: "涓氬姟绫诲瀷",
                 anfme: "鏁伴噺",
-                qty: "瀹屾垚鏁伴噺",
+                qty: "宸插嚭搴撴暟閲�",
                 logisNo: "鐗╂祦鍗曞彿",
                 arrTime: "棰勮鍒拌揪鏃堕棿",
                 rleStatus: "閲婃斁鐘舵��",
@@ -528,25 +588,55 @@
             asnOrderItem: {
                 asnId: "涓诲崟鏍囪瘑",
                 asnCode: "涓诲崟缂栫爜",
-                poDetlId: "PO鍗曟爣璇�",
-                poDetlCode: "PO鍗曠紪鐮�",
+                poDetlId: "PO鍗旾D",
+                poDetlCode: "PO鍗�",
+                platItemId: '琛屽彿',
+                matnrId: "鐗╂枡鏍囪瘑",
+                maktx: "鐗╂枡鍚嶇О",
+                spec: "瑙勬牸",
+                model: "鍨嬪彿",
+                matnrCode: "鐗╂枡缂栫爜",
+                anfme: "璁″垝鏁伴噺",
+                stockUnit: "鍗曚綅",
+                isptResult: "璐ㄦ缁撴灉",
+                purQty: "閲囪喘閲�",
+                purUnit: "閲囪喘鍗曚綅",
+                unit: '鍗曚綅',
+                qty: "瀹屾垚鏁�",
+                safeQty: '鍚堟牸鏁�',
+                disQty: '涓嶅悎鏍兼暟',
+                splrBatch: "鎵规",
+                splrCode: "渚涘簲鍟嗙紪鐮�",
+                splrName: "渚涘簲鍟�",
+                qrcode: "浜岀淮鐮�",
+                barcode: "搴忓垪鐮�",
+                isptResult: "璐ㄦ鐘舵��",
+                packName: "鍖呰",
+                ntyStatus: "鎶ユ鐘舵��",
+                prodTime: "鐢熶骇鏃ユ湡",
+            },
+            outStockItem: {
+                asnId: "涓诲崟鏍囪瘑",
+                asnCode: "鍗曞彿",
+                poDetlId: "骞冲彴鏄庣粏ID",
+                poDetlCode: "DO鍗�",
                 matnrId: "鐗╂枡鏍囪瘑",
                 maktx: "鐗╂枡鍚嶇О",
                 matnrCode: "鐗╂枡缂栫爜",
-                anfme: "璁″垝鏀惰揣鏁伴噺",
+                anfme: "璁″垝鍑哄簱鏁�",
                 stockUnit: "搴撳瓨鍗曚綅",
-                purQty: "閲囪喘鏁伴噺",
-                purUnit: "閲囪喘鍗曚綅",
-                qty: "宸插畬鎴愭暟閲�",
+                purQty: "涓嬪崟鏁伴噺",
+                purUnit: "鍗曚綅",
+                qty: "瀹屾垚鏁伴噺",
                 splrBatch: "渚涘簲鍟嗘壒娆�",
                 splrCode: "渚涘簲鍟嗙紪鐮�",
                 splrName: "渚涘簲鍟嗗悕绉�",
                 qrcode: "浜岀淮鐮�",
                 barcode: "鏉″舰鐮�",
-                packName: "鍖呰鍚嶇О",
+                packName: "鍖呰",
                 ntyStatus: "鎶ユ鐘舵��",
                 prodTime: "鐢熶骇鏃ユ湡",
-                platItemId: 'PO鍗曞彿'
+                platItemId: '琛屽彿'
             },
             asnOrderLog: {
                 code: "缂栫爜",
@@ -554,7 +644,7 @@
                 poId: "PO鏍囪瘑",
                 type: "鍗曟嵁绫诲瀷",
                 wkType: "涓氬姟绫诲瀷",
-                anfme: "鏁伴噺",
+                anfme: "璁″垝鏁伴噺",
                 qty: "宸插畬鎴愭暟閲�",
                 logisNo: "鐗╂祦鍗曞彿",
                 arrTime: "棰勮鍒拌揪鏃堕棿",
@@ -600,6 +690,35 @@
                 startTime: "寮�濮嬫椂闂�",
                 endTime: "缁撴潫鏃堕棿",
             },
+            delivery: {
+                code: "DO缂栫爜",
+                platId: "骞冲彴ID",
+                type: "鍗曟嵁绫诲瀷",
+                wkType: "涓氬姟绫诲瀷",
+                source: "鍗曟嵁鏉ユ簮",
+                anfme: "鏁伴噺",
+                qty: "瀹屾垚鏁伴噺",
+                workQty: "鎵ц鏁伴噺",
+                platCode: "骞冲彴缂栫爜",
+                startTime: "寮�濮嬫椂闂�",
+                endTime: "缁撴潫鏃堕棿",
+            },
+            deliveryItem: {
+                deliveryId: "涓诲崟ID",
+                deliveryCode: "鍗曞彿",
+                platItemId: "琛屽彿",
+                matnrCode: "鐗╂枡缂栫爜",
+                matnrName: "鐗╂枡鍚嶇О",
+                fieldsIndex: "瀛楁绱㈠紩",
+                unit: "鍗曚綅",
+                anfme: "鏁伴噺",
+                qty: "瀹屾垚鏁伴噺",
+                nromQty: "nromQty",
+                printQty: "鎵撳嵃鏁伴噺",
+                splrName: "渚涘簲鍟嗗悕绉�",
+                splrCode: "渚涘簲鍟嗙紪鐮�",
+                splrBatch: "渚涘簲鍟嗘壒娆�",
+            },
             purchaseItem: {
                 purchaseId: "PO涓诲崟鏍囪瘑",
                 platItemId: "erp鏄庣粏鏍囪瘑",
@@ -618,7 +737,7 @@
             fields: {
                 fields: "瀛楁",
                 fieldsAlise: "瀛楁鍒悕",
-                unique: "鏄惁蹇呭~",
+                unique: "鏁版嵁绫诲瀷",
                 flagEnable: "鍚敤",
             },
             fieldsItem: {
@@ -630,15 +749,15 @@
             },
             deviceSite: {
                 type: "鍏ュ嚭搴撶被鍨�",
-                site: "绔欑偣缂栧彿",
+                site: "浣滀笟绔欑偣",
                 name: "鍚嶇О",
-                wcsCode: "wcs绔欑偣缂栧彿",
+                target: "鐩爣绔欑偣",
                 label: "绔欑偣鏍囩",
                 device: "绔嬪簱绫诲瀷",
                 deviceCode: "璁惧缂栧彿",
                 deviceSite: "璁惧绔欑偣",
                 flagInit: "鏄惁鍒濆鍖�",
-                sites: "浣滀笟绔欑偣",
+                wcsCode: "wcs缂栧彿",
             },
             waitPakin: {
                 code: "缂栫爜",
@@ -658,6 +777,7 @@
                 asnCode: "鏀惰揣閫氱煡鍗曠紪鐮�",
                 asnItemId: "鏀惰揣閫氱煡鍗曟槑缁唅d",
                 trackCode: "鏉″舰鐮�",
+                isptResult: '璐ㄦ鐘舵��',
                 anfme: "鏁伴噺",
                 workQty: "鎵ц涓暟閲�",
                 unit: "鍗曚綅",
@@ -689,6 +809,33 @@
                 qty: "宸插畬鎴�",
                 batch: "鎵规",
             },
+            wave: {
+                code: "娉㈡鍙�",
+                type: "鍗曟嵁绫诲瀷",
+                exceStatus: "鐘舵��",
+                anfme: "鏁伴噺",
+                qty: "瀹屾垚鏁伴噺",
+                orderNum: "鍗曟嵁鏁�",
+            },
+            waveItem: {
+                waveId: "娉㈡ID",
+                waveCode: "娉㈡鍙�",
+                matnrId: "鐗╂枡ID",
+                matnrName: "鐗╂枡鍚嶇О",
+                matnrCode: "鐗╂枡缂栫爜",
+                batch: "鎵规",
+                splrBatch: "渚涘簲鍟嗘壒娆�",
+                orderCode: "婧愬崟鍙�",
+                orderItemId: "婧愬崟鏄庣粏ID",
+                unit: "鍗曚綅",
+                trackCode: "璺熻釜鐮�",
+                fieldsIndex: "鍔ㄦ�佹墿灞�",
+                anfme: "鏁伴噺",
+                workQty: "鎵ц鏁�",
+                qty: "瀹屾垚鏁伴噺",
+                stockLocs: "搴撳瓨浣嶇疆",
+                stockQty: "搴撳瓨鏁伴噺",
+            },
             task: {
                 taskCode: "浠诲姟鍙�",
                 taskStatus: "鐘舵��",
@@ -697,7 +844,7 @@
                 orgSite: "婧愮珯鐐�",
                 targLoc: "鐩爣搴撲綅",
                 targSite: "鐩爣绔欑偣",
-                barcode: "鎷栫洏鐮�",
+                barcode: "鎵樼洏鐮�",
                 robotCode: "鏈哄櫒缂栫爜",
                 exceStatus: "鎵ц鐘舵��",
                 expDesc: "寮傚父璇存槑",
@@ -715,7 +862,7 @@
                 orgSite: "婧愮珯鐐�",
                 targLoc: "鐩爣搴撲綅",
                 targSite: "鐩爣绔欑偣",
-                barcode: "鎷栫洏鐮�",
+                barcode: "鎵樼洏鐮�",
                 robotCode: "鏈哄櫒缂栫爜",
                 exceStatus: "鎵ц鐘舵��",
                 expDesc: "寮傚父璇存槑",
@@ -732,6 +879,7 @@
                 source: "婧怚D",
                 matnrId: "鐗╂枡ID",
                 maktx: "鐗╂枡鍚嶇О",
+                isptResult: '璐ㄦ鐘舵��',
                 matnrCode: "鐗╂枡缂栫爜",
                 unit: "鍗曚綅",
                 anfme: "鏁伴噺",
@@ -788,21 +936,35 @@
             },
             locItem: {
                 locId: "搴撲綅ID",
+                locCode: "搴撲綅",
                 orderId: "璁㈠崟ID",
                 type: "鍗曟嵁绫诲瀷",
                 orderItemId: "鍗曟嵁鏄庣粏ID",
                 wkType: "涓氬姟绫诲瀷",
                 matnrId: "鐗╂枡ID",
                 maktx: "鐗╂枡鍚嶇О",
+                unit: '鍗曚綅',
+                anfme: '鏁伴噺',
                 matnrCode: "鐗╂枡缂栫爜",
                 trackCode: "璺熻釜鐮�",
-                unit: "鍗曚綅",
-                anfme: "鏁伴噺",
+                workQty: '鎵ц鏁�',
                 batch: "鎵规",
                 splrBatch: "渚涘簲鍟嗘壒娆�",
                 spec: "瑙勬牸",
                 model: "鍨嬪彿",
                 fieldsIndex: "鍔ㄦ�佺储寮�",
+            },
+            deviceBind: {
+                currentRow: "褰撳墠鎺掑彿",
+                startRow: "璧峰鎺掑彿",
+                endRow: "缁堟鎺掑彿",
+                deviceQty: "璁惧鏁伴噺",
+                startDeviceNo: "璧峰璁惧鍙�",
+                endDeviceNo: "缁堟璁惧鍙�",
+                staList: "绔欑偣闆�",
+                typeId: "搴撳尯绫诲瀷",
+                beSimilar: "鐩镐技寮�鍏�",
+                emptySimilar: "绌烘澘闈犺繎寮�鍏�",
             },
         }
     },
@@ -890,10 +1052,14 @@
         unenable: '绂佺敤',
         locInit: '搴撲綅鍒濆鍖�',
         siteInit: '绔欑偣鍒濆鍖�',
+        continue: '缁х画鏀惰揣',
         batch: '鎵归噺鎿嶄綔',
         confirm: '纭',
+        bulkExport: "鎵归噺瀵煎嚭",
         selectSite: '閫夋嫨绔欑偣',
+        confirmSelect: '纭閫夋嫨',
         cancel: "鍙栨秷",
+        query: "鏌ヨ",
         top: "缃《",
         resort: "鎺掑簭",
         subzone: '缁戝畾鍒嗗尯',
@@ -910,12 +1076,22 @@
         batchLocType: "鎵归噺搴撲綅绫诲瀷",
         batchPrint: "鎵归噺鎵撳嵃",
         quality: "璐ㄦ",
-        complete: "瀹屾垚",
+        complete: "瀹岀粨",
         close: "鍏抽棴",
-        asnCreate: "閫氳繃ASN鍒涘缓",
-        createTask: "鐢熸垚浠诲姟",
+        asnCreate: "閫氳繃鍗曟嵁鍒涘缓",
+        poCreate: "閫氳繃PO鍗曞垱寤�",
+        orderPrint: '鎵撳嵃鍗曟嵁',
+        createTask: "涓嬪彂浠诲姟",
+        createWave: "鐢熸垚娉㈡",
         recover: "缁х画鏀惰揣",
     },
+    request: {
+        error: {
+            stock: "搴撳瓨涓嶈冻锛屾棤娉曟彁浜わ紒锛�", 
+            select_error_order: "璇烽�夋嫨閫氱煡鍗�",
+        }
+
+    }
 };
 
 export default customChineseMessages;

--
Gitblit v1.9.1