From 031e36213941ad3430da2b0429701e742f09f5d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:14:20 +0800
Subject: [PATCH] Merge branch 'front' into devlop

---
 rsf-admin/src/i18n/en.js |   86 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index fcb6747..602630c 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -68,6 +68,7 @@
             deprecate: 'Deprecate',
             resend: 'RESEND',
             selected: 'selected',
+            batch: 'batch'
         },
         msg: {
             confirm: {
@@ -140,6 +141,16 @@
         purchase: 'Purchase',
         purchaseItem: 'PurchaseItem',
         whMat: 'Warehouse Mat',
+        fields: 'Extend Fields',
+        fieldsItem: 'Extend Fields Items',
+        warehouseAreasItem: 'WarehouseAreasItem',
+        endBay: "endBay",
+        endLev: "endLev",
+        endRow: "endRow",
+        locType: "locType",
+        startBay: "startBay",
+        startLev: "startLev",
+        startRow: "startRow",
     },
     table: {
         field: {
@@ -254,7 +265,7 @@
                 shipperId: "shipperId",
                 groupId: "groupId",
                 rglarId: "RegularId",
-                erpCode: "erpCode",
+                platCode: "platCode",
                 spec: "spec",
                 model: "model",
                 weight: "weight",
@@ -301,6 +312,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",
@@ -312,6 +342,9 @@
                 barcode: "Barcode",
                 unit: "Unit",
                 size: "Size",
+                length: "length",
+                width: "width",
+                height: "height",
                 row: "Row",
                 col: "Col",
                 lev: "Lev",
@@ -344,8 +377,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 +471,7 @@
                 poDetlId: "poDetlId",
                 poDetlCode: "poDetlCode",
                 matnrId: "matnrId",
-                matnk: "matnk",
+                maktx: "maktx",
                 anfme: "anfme",
                 stockUnit: "stockUnit",
                 purQty: "purQty",
@@ -435,7 +486,7 @@
             },
             purchase: {
                 code: "code",
-                erpId: "erpId",
+                platId: "PlatId",
                 type: "type",
                 wkType: "wkType",
                 source: "source",
@@ -444,7 +495,7 @@
                 qty: "qty",
                 workQty: "workQty",
                 channel: "channel",
-                erpCode: "erpCode",
+                platCode: "platCode",
                 project: "project",
                 startTime: "startTime",
                 endTime: "endTime",
@@ -463,6 +514,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",
             },
         }
     },
@@ -538,7 +602,15 @@
             shipper: 'shipper is required',
             groupId: 'groupId is required',
         }
-    }
+    },
+    toolbar: {
+        inspection: "Inspection",
+        creatcode: "creatcode",
+        print: "print",
+        enable: 'enable',
+        unenable: 'unenable',
+        locInit: 'loc init'
+    },
 };
 
 export default customEnglishMessages;

--
Gitblit v1.9.1