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 |  281 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 223 insertions(+), 58 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 634a934..4596053 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -129,7 +129,20 @@
         loc: 'Loc',
         container: 'Container',
         contract: 'Contract',
-        stockItem: 'StockItem',
+        qlyInspect: 'QlyInspect',
+        dictType: 'DictType',
+        dictData: 'DictData',
+        companys: 'Companys',
+        serialRuleItem: 'SerialRuleItem',
+        serialRule: 'SerialRule',
+        asnOrder: 'AsnOrder',
+        asnOrderItem: 'AsnOrderItem',
+        purchase: 'Purchase',
+        purchaseItem: 'PurchaseItem',
+        whMat: 'Warehouse Mat',
+        fields: 'Extend Fields',
+        fieldsItem: 'Extend Fields Items',
+        warehouseAreasItem: 'WarehouseAreasItem',
     },
     table: {
         field: {
@@ -244,7 +257,7 @@
                 shipperId: "shipperId",
                 groupId: "groupId",
                 rglarId: "RegularId",
-                erpCode: "erpCode",
+                platCode: "platCode",
                 spec: "spec",
                 model: "model",
                 weight: "weight",
@@ -291,75 +304,218 @@
                 flagLabelMange: "flagLabelMange",
                 flagMix: "flagMix",
             },
-            loc: {
+            warehouseAreasItem: {
                 areaId: "areaId",
-                code: "code",
-                type: "type",
-                name: "name",
-                flagLogic: "flagLogic",
-                fucAtrrs: "fucAtrrs",
+                areaName: "areaName",
+                matnrId: "matnrId",
+                matnrName: "matnrName",
+                matnrCode: "matnrCode",
+                fieldsIndex: "fieldsIndex",
                 barcode: "barcode",
+                anfme: "anfme",
+                batch: "batch",
                 unit: "unit",
-                size: "size",
-                row: "row",
-                col: "col",
-                lev: "lev",
-                channel: "channel",
-                maxParts: "maxParts",
-                maxPack: "maxPack",
-                flagLabelMange: "flagLabelMange",
-                locAttrs: "locAttrs",
+                stockUnit: "stockUnit",
+                brand: "brand",
+                shipperId: "shipperId",
+                splrId: "splrId",
+                weight: "weight",
+                prodTime: "prodTime",
+                splrBtch: "splrBtch",
+            },
+            loc: {
+                warehouseId: "Warehouse",
+                areaId: "Area",
+                code: "Code",
+                type: "Type",
+                name: "Name",
+                flagLogic: "FlagLogic",
+                fucAtrrs: "FucAtrrs",
+                barcode: "Barcode",
+                unit: "Unit",
+                size: "Size",
+                row: "Row",
+                col: "Col",
+                lev: "Lev",
+                channel: "Channel",
+                maxParts: "MaxParts",
+                maxPack: "MaxPack",
+                flagLabelMange: "FlagLabelMange",
+                locAttrs: "LocAttrs",
             },
             container: {
-                code: "code",
-                name: "name",
-                typeId: "typeId",
-                used: "used",
-                lenght: "lenght",
-                width: "width",
-                height: "height",
-                rstLen: "rstLen",
-                rstWid: "rstWid",
-                rstWei: "rstWei",
-                rstHei: "rstHei",
-                panrentId: "panrentId",
-                vaildTime: "vaildTime",
-                flagRycle: "flagRycle",
-                flagLogic: "flagLogic",
+                code: "Code",
+                name: "Name",
+                typeId: "TypeId",
+                used: "Used",
+                lenght: "Lenght",
+                width: "Width",
+                height: "Height",
+                rstLen: "RstLen",
+                rstWid: "RstWid",
+                rstWei: "RstWei",
+                rstHei: "RstHei",
+                panrentId: "PanrentId",
+                vaildTime: "VaildTime",
+                flagRycle: "FlagRycle",
+                flagLogic: "FlagLogic",
             },
             contract: {
                 code: "Code",
                 name: "Name",
                 projectName: "ProjectName",
             },
-            stockItem: {
-                stockId: "stockId",
-                matnrId: "matnrId",
+            qlyInspect: {
                 code: "code",
-                matnrk: "matnrk",
+                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",
+                name: "Name",
+                description: "Description",
+            },
+            dictData: {
+                dictTypeId: "dictTypeId",
+                dictTypeCode: "dictTypeCode",
+                value: "value",
+                label: "label",
+                sort: "sort",
+                color: "color",
+            },
+            companys: {
+                code: "Code",
+                name: "Name",
+                nameEn: "NameEn",
+                breifCode: "BreifCode",
+                type: "Type",
+                contact: "Contact",
+                tel: "Tel",
+                email: "Email",
+                pcode: "PCode",
+                province: "Province",
+                city: "City",
+                address: "Address",
+            },
+            serialRuleItem: {
+                ruleId: "ruleId",
+                wkType: "wkType",
+                feildValue: "feildValue",
+                len: "len",
+                lenStr: "lenStr",
+                sort: "sort",
+            },
+            serialRule: {
+                code: "code",
+                name: "name",
+                delimit: "delimit",
+                reset: "reset",
+                resetDep: "resetDep",
+                currValue: "currValue",
+                lastCode: "lastCode",
+            },
+            whMat: {
+                matnrCode: "matnrCode",
+                matnrName: "matnrName",
+                matnrGroupId: "matnrGroupId",
+                spec: "spec",
+                color: "color",
+                size: "size",
+                minWeight: "minWeight",
+                maxWeight: "maxWeight",
+            },
+            asnOrder: {
+                code: "Code",
+                poCode: "poCode",
+                poId: "poId",
+                type: "Type",
+                wkType: "wkType",
                 anfme: "anfme",
-                workQty: "workQty",
                 qty: "qty",
-                weight: "weight",
-                unit: "unit",
-                shipperId: "shipperId",
-                splrId: "splrId",
-                brand: "brand",
-                batch: "batch",
-                prodTime: "prodTime",
-                inspectId: "inspectId",
-                splrBtch: "splrBtch",
-                asnOrder: "asnOrder",
-                erpToken: "erpToken",
-                erpOrder: "erpOrder",
-                erpStkAdr: "erpStkAdr",
-                locId: "locId",
+                logisNo: "logisNo",
+                arrTime: "Arrived",
+                rleStatus: "Release",
+                ntyStatus: "Notify",
+            },
+            asnOrderItem: {
+                asnId: "asnId",
+                asnCode: "asnCode",
+                poDetlId: "poDetlId",
+                poDetlCode: "poDetlCode",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                anfme: "anfme",
+                stockUnit: "stockUnit",
+                purQty: "purQty",
+                purUnit: "purUnit",
+                qty: "qty",
+                splrCode: "splrCode",
+                splrName: "splrName",
+                qrcode: "qrcode",
                 barcode: "barcode",
-                purPrice: "purPrice",
-                lockReason: "lockReason",
-                lockStatus: "lockStatus",
-                locker: "locker",
-                lockedTime: "lockedTime",
+                packName: "packName",
+                ntyStatus: "ntyStatus",
+            },
+            purchase: {
+                code: "code",
+                platId: "PlatId",
+                type: "type",
+                wkType: "wkType",
+                source: "source",
+                preArr: "preArr",
+                anfme: "anfme",
+                qty: "qty",
+                workQty: "workQty",
+                channel: "channel",
+                platCode: "platCode",
+                project: "project",
+                startTime: "startTime",
+                endTime: "endTime",
+            },
+            purchaseItem: {
+                purchaseId: "purchaseId",
+                platItemId: "erpItemId",
+                matnrCode: "matnrCode",
+                matnrName: "matnrName",
+                unit: "unit",
+                anfme: "anfme",
+                qty: "qty",
+                nromQty: "nromQty",
+                asnQty: "asnQty",
+                printQty: "printQty",
+                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",
             },
         }
     },
@@ -424,14 +580,23 @@
                 batchRole: 'batch role',
             }
         },
-        
+        whMat: {
+            title: {
+                add: 'add',
+            }
+        },
     },
     form: {
         matnr: {
             shipper: 'shipper is required',
             groupId: 'groupId is required',
         }
-    }
+    },
+    toolbar: {
+        inspection: "Inspection",
+        creatcode: "creatcode",
+        print: "print",
+    },
 };
 
 export default customEnglishMessages;

--
Gitblit v1.9.1