From 85b8e7ba6c4d0d780a7f90360150f2bd955eb874 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 08:07:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/en.js |   48 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index e6b9ca2..955d2bc 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -147,12 +147,9 @@
         fields: 'Extend Fields',
         fieldsItem: 'Extend Fields Items',
         warehouseAreasItem: 'WarehouseAreasItem',
-        endBay: "endBay",
-        endLev: "endLev",
-        endRow: "endRow",
-        startBay: "startBay",
-        startLev: "startLev",
-        startRow: "startRow",
+        deviceSite: 'deviceSite',
+        waitPakin: 'WaitPakin',
+        waitPakinItem: 'WaitPakinItem',
     },
     table: {
         field: {
@@ -375,6 +372,9 @@
             locAreaMat: {
                 code: "code",
                 depict: "depict",
+                name: "name",
+                warehouseId: "warehouseId",
+                areaId: "areaId",
             },
             locAreaMatRela: {
                 areaId: "areaId",
@@ -558,6 +558,38 @@
                 matnrId: "MatnrId",
                 shiperId: "Shipper",
             },
+            deviceSite: {
+                type: "type",
+                site: "site",
+                name: "name",
+                wcsCode: "wcsCode",
+                label: "label",
+                device: "device",
+                deviceCode: "deviceCode",
+                deviceSite: "deviceSite",
+                flagInit: "flagInit",
+                sites: "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: {
@@ -640,6 +672,7 @@
         enable: 'enable',
         unenable: 'unenable',
         locInit: 'loc init',
+        siteInit: 'site init',
         batch: 'batch',
         confirm: 'confirm',
         subzone: 'subzone',
@@ -650,6 +683,9 @@
         batchMix: 'batchFiexed',
         batchWarehouse: 'batchWarehouse',
         batchStockLevel: "batchStockLevel",
+        batchWarehouseAreas: "batchWarehouseAreas",
+        batchLocType: "batchLocType",
+        batchPrint: "batch print",
     },
 };
 

--
Gitblit v1.9.1