From 7aa1d1fac96e4241ccf35aa3a19d95d62fab623b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 28 三月 2025 15:45:30 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index a1976a7..bbe448c 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -147,6 +147,9 @@
         fields: '鎵╁睍瀛楁',
         fieldsItem: '鎵╁睍瀛楁鏄庣粏',
         warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
+        deviceSite: '绔欑偣绠＄悊',
+        waitPakin: 'WaitPakin',
+        waitPakinItem: 'WaitPakinItem',
     },
     table: {
         field: {
@@ -278,8 +281,8 @@
                 minQty: "鏈�灏忓��",
                 maxQty: "鏈�澶у��",
                 stagn: "鍋滄粸棰勮鍊�",
-                valid: "淇濊川鏈�",
-                validWarn: "鏁堟湡棰勮",
+                valid: "淇濊川鏈�(澶�)",
+                validWarn: "鏁堟湡棰勮(澶�)",
                 flagCheck: "鍏嶆",
             },
             matnrGroup: {
@@ -375,6 +378,9 @@
             locAreaMat: {
                 code: "閫昏緫缂栫爜",
                 depict: "閫昏緫鎻忚堪",
+                name: "鍚嶇О",
+                warehouseId: "浠撳簱",
+                areaId: "搴撳尯",
             },
             locAreaMatRela: {
                 areaId: "搴撳尯",
@@ -558,6 +564,38 @@
                 matnrId: "matnrId",
                 shiperId: "shiperId",
             },
+            deviceSite: {
+                type: "鍏ュ嚭搴撶被鍨�",
+                site: "绔欑偣缂栧彿",
+                name: "鍚嶇О",
+                wcsCode: "wcs绔欑偣缂栧彿",
+                label: "绔欑偣鏍囩",
+                device: "璁惧绫诲瀷",
+                deviceCode: "璁惧缂栧彿",
+                deviceSite: "璁惧绔欑偣",
+                flagInit: "鏄惁鍒濆鍖�",
+                sites: "浣滀笟绔欑偣",
+            },
+            waitPakin: {
+                code: "code",
+                ansId: "ansId",
+                asnCode: "asnCode",
+                barcode: "barcode",
+                anfme: "anfme",
+                ioStatus: "ioStatus",
+            },
+            waitPakinItem: {
+                pakinId: "pakinId",
+                maktx: "maktx",
+                matnrId: "matnrId",
+                matnrCode: "matnrCode",
+                anfme: "anfme",
+                workQty: "workQty",
+                unit: "unit",
+                fieldsIndex: "fieldsIndex",
+                qty: "qty",
+                batch: "batch",
+            },
         }
     },
     page: {
@@ -641,13 +679,23 @@
         print: "鎵撳嵃",
         enable: '鍚敤',
         unenable: '绂佺敤',
-        locInit: '聽搴撲綅鍒濆鍖�',
+        locInit: '搴撲綅鍒濆鍖�',
+        siteInit: '绔欑偣鍒濆鍖�',
         batch: '鎵归噺鎿嶄綔',
         confirm: '纭',
         subzone: '缁戝畾鍒嗗尯',
         bindmatnr: '缁戝畾鐗╂枡',
         bindloc: '缁戝畾搴撲綅',
         batchMatnrGropu: '鎵归噺鐗╂枡鍒嗙粍',
+        batchStatus: '鎵归噺鐘舵��',
+        batchMix: '鎵归噺娣锋斁',
+        batchWarehouse: '鎵归噺浠撳簱',
+        batchStockLevel: "鎵归噺ABC鍒嗙被",
+        batchValidWarn: "鎵归噺棰勮",
+        batchFlagCheck: "鎵归噺鍏嶆",
+        batchWarehouseAreas: "鎵归噺搴撳尯",
+        batchLocType: "鎵归噺搴撲綅绫诲瀷",
+        batchPrint: "鎵归噺鎵撳嵃",
     },
 };
 

--
Gitblit v1.9.1