From d96cb8a176a2cd7406de97b9a6e321f8ecd4c707 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 07:59:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index fe02573..8f45034 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -141,18 +141,17 @@
         serialRule: 'SerialRule',
         asnOrder: 'AsnOrder',
         asnOrderItem: 'AsnOrderItem',
+        asnOrderLog: 'asnOrderLog',
+        asnOrderItemLog: 'asnOrderItemLog',
         purchase: 'Purchase',
         purchaseItem: 'PurchaseItem',
         whMat: 'Warehouse Mat',
         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: {
@@ -292,6 +291,7 @@
                 name: "name",
                 code: "code",
                 parentId: "parentId",
+                parCode: "parCode",
             },
             warehouse: {
                 name: "name",
@@ -374,6 +374,9 @@
             locAreaMat: {
                 code: "code",
                 depict: "depict",
+                name: "name",
+                warehouseId: "warehouseId",
+                areaId: "areaId",
             },
             locAreaMatRela: {
                 areaId: "areaId",
@@ -513,6 +516,44 @@
                 packName: "packName",
                 ntyStatus: "ntyStatus",
             },
+            asnOrderLog: {
+                code: "code",
+                poCode: "poCode",
+                poId: "poId",
+                type: "type",
+                wkType: "wkType",
+                anfme: "anfme",
+                qty: "qty",
+                logisNo: "logisNo",
+                arrTime: "arrTime",
+                rleStatus: "rleStatus",
+                ntyStatus: "ntyStatus",
+            },
+            asnOrderItemLog: {
+                asnId: "asnId",
+                asnCode: "asnCode",
+                platItemId: "platItemId",
+                poDetlId: "poDetlId",
+                poCode: "poCode",
+                fieldsIndex: "fieldsIndex",
+                matnrId: "matnrId",
+                matnrCode: "matnrCode",
+                maktx: "maktx",
+                anfme: "anfme",
+                stockUnit: "stockUnit",
+                purQty: "purQty",
+                purUnit: "purUnit",
+                qty: "qty",
+                splrCode: "splrCode",
+                splrBatch: "splrBatch",
+                splrName: "splrName",
+                qrcode: "qrcode",
+                trackCode: "trackCode",
+                barcode: "barcode",
+                packName: "packName",
+                ntyStatus: "ntyStatus",
+                prodTime: "prodTime",
+            },
             purchase: {
                 code: "code",
                 platId: "PlatId",
@@ -556,6 +597,66 @@
                 value: "Value",
                 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",
+                asnId: "asnId",
+                asnCode: "asnCode",
+                asnItemId: "asnItemId",
+                trackCode: "trackCode",
+                anfme: "anfme",
+                workQty: "workQty",
+                unit: "unit",
+                fieldsIndex: "fieldsIndex",
+                qty: "qty",
+                batch: "batch",
+            },
+            waitPakinLog: {
+                pakinId: "pakinId",
+                code: "code",
+                barcode: "barcode",
+                anfme: "anfme",
+                ioStatus: "ioStatus",
+            },
+            waitPakinItemLog: {
+                pakinId: "pakinId",
+                pakinItemId: "pakinItemId",
+                asnId: "asnId",
+                asnCode: "asnCode",
+                asnItemId: "asnItemId",
+                trackCode: "trackCode",
+                maktx: "maktx",
+                matnrId: "matnrId",
+                matnrCode: "matnrCode",
+                anfme: "anfme",
+                workQty: "workQty",
+                unit: "unit",
+                fieldsIndex: "fieldsIndex",
+                qty: "qty",
+                batch: "batch",
             },
         }
     },
@@ -639,11 +740,20 @@
         enable: 'enable',
         unenable: 'unenable',
         locInit: 'loc init',
+        siteInit: 'site init',
         batch: 'batch',
         confirm: 'confirm',
         subzone: 'subzone',
         bindmatnr: 'bind matnr',
         bindloc: 'bind loc',
+        batchMatnrGropu: 'batchMatnrGropu',
+        batchStatus: 'batchStatus',
+        batchMix: 'batchFiexed',
+        batchWarehouse: 'batchWarehouse',
+        batchStockLevel: "batchStockLevel",
+        batchWarehouseAreas: "batchWarehouseAreas",
+        batchLocType: "batchLocType",
+        batchPrint: "batch print",
     },
 };
 

--
Gitblit v1.9.1