From d17254e25cfaf8361c08eea6f16d99571a49174f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 15 三月 2025 17:34:24 +0800
Subject: [PATCH] Merge branch 'front' into devlop

---
 rsf-admin/src/i18n/en.js |   89 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index e2a33b9..4596053 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -140,6 +140,9 @@
         purchase: 'Purchase',
         purchaseItem: 'PurchaseItem',
         whMat: 'Warehouse Mat',
+        fields: 'Extend Fields',
+        fieldsItem: 'Extend Fields Items',
+        warehouseAreasItem: 'WarehouseAreasItem',
     },
     table: {
         field: {
@@ -254,7 +257,7 @@
                 shipperId: "shipperId",
                 groupId: "groupId",
                 rglarId: "RegularId",
-                erpCode: "erpCode",
+                platCode: "platCode",
                 spec: "spec",
                 model: "model",
                 weight: "weight",
@@ -301,6 +304,25 @@
                 flagLabelMange: "flagLabelMange",
                 flagMix: "flagMix",
             },
+            warehouseAreasItem: {
+                areaId: "areaId",
+                areaName: "areaName",
+                matnrId: "matnrId",
+                matnrName: "matnrName",
+                matnrCode: "matnrCode",
+                fieldsIndex: "fieldsIndex",
+                barcode: "barcode",
+                anfme: "anfme",
+                batch: "batch",
+                unit: "unit",
+                stockUnit: "stockUnit",
+                brand: "brand",
+                shipperId: "shipperId",
+                splrId: "splrId",
+                weight: "weight",
+                prodTime: "prodTime",
+                splrBtch: "splrBtch",
+            },
             loc: {
                 warehouseId: "Warehouse",
                 areaId: "Area",
@@ -344,8 +366,26 @@
                 projectName: "ProjectName",
             },
             qlyInspect: {
-                code: "Code",
-                name: "Name",
+                code: "code",
+                wkType: "wkType",
+                safeQty: "safeQty",
+                dlyQty: "dlyQty",
+                rcptQty: "rcptQty",
+                isptQty: "isptQty",
+            },
+            qlyIsptItem: {
+                ispectId: "ispectId",
+                matnrCode: "matnrCode",
+                maktx: "maktx",
+                label: "label",
+                splrName: "splrName",
+                splrBatch: "splrBatch",
+                stockBatch: "stockBatch",
+                rcptQty: "rcptQty",
+                dlyQty: "dlyQty",
+                disQty: "disQty",
+                safeQty: "safeQty",
+                picPath: "picPath",
             },
             dictType: {
                 code: "Code",
@@ -420,7 +460,7 @@
                 poDetlId: "poDetlId",
                 poDetlCode: "poDetlCode",
                 matnrId: "matnrId",
-                matnk: "matnk",
+                maktx: "maktx",
                 anfme: "anfme",
                 stockUnit: "stockUnit",
                 purQty: "purQty",
@@ -433,24 +473,9 @@
                 packName: "packName",
                 ntyStatus: "ntyStatus",
             },
-            purchaseItem: {
-                purchaseId: "purchaseId",
-                erpItemId: "erpItemId",
-                matnrCode: "matnrCode",
-                matnrName: "matnrName",
-                unit: "unit",
-                anfme: "anfme",
-                qty: "qty",
-                nromQty: "nromQty",
-                asnQty: "asnQty",
-                printQty: "printQty",
-                splrName: "splrName",
-                splrCode: "splrCode",
-                splrBatch: "splrBatch",
-            },
             purchase: {
                 code: "code",
-                erpId: "erpId",
+                platId: "PlatId",
                 type: "type",
                 wkType: "wkType",
                 source: "source",
@@ -459,14 +484,14 @@
                 qty: "qty",
                 workQty: "workQty",
                 channel: "channel",
-                erpCode: "erpCode",
+                platCode: "platCode",
                 project: "project",
                 startTime: "startTime",
                 endTime: "endTime",
             },
             purchaseItem: {
                 purchaseId: "purchaseId",
-                erpItemId: "erpItemId",
+                platItemId: "erpItemId",
                 matnrCode: "matnrCode",
                 matnrName: "matnrName",
                 unit: "unit",
@@ -478,6 +503,19 @@
                 splrName: "splrName",
                 splrCode: "splrCode",
                 splrBatch: "splrBatch",
+            },
+            fields: {
+                fields: "Fields",
+                fieldsAlise: "FieldsAlise",
+                unique: "Unique",
+                flagEnable: "FlagEnable",
+            },
+            fieldsItem: {
+                uuid: "uuid",
+                fieldsId: "FieldsId",
+                value: "Value",
+                matnrId: "MatnrId",
+                shiperId: "Shipper",
             },
         }
     },
@@ -553,7 +591,12 @@
             shipper: 'shipper is required',
             groupId: 'groupId is required',
         }
-    }
+    },
+    toolbar: {
+        inspection: "Inspection",
+        creatcode: "creatcode",
+        print: "print",
+    },
 };
 
 export default customEnglishMessages;

--
Gitblit v1.9.1