From d7bb8c43b17253b46c6a466cff5545e8b4bcaad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:10:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/en.js |   95 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 1891dfd..63c252c 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -95,6 +95,14 @@
             },
             placeholder: 'Please enter your search content',
         },
+        aside: {
+            category: 'Category',
+            material: 'Material锛坉efault锛�',
+            supplier: 'Supplier',
+            warehouse: 'Warehouse',
+            batch: 'Batch',
+            dynamicFields: 'Dynamic Fields'
+        }
     },
     filters: {
         lastCreated: 'Last created',
@@ -194,10 +202,37 @@
         deviceBind: 'Device Bind',
         tasks: 'Tasks',
         wave: 'Wave Manage',
+        basStation: 'BasStation',
+        basContainer: 'BasContainer',
+        waveRule: 'Wave Rules',
 
     },
     table: {
         field: {
+            outBound: {
+                stockWithdrawal: 'StockWithdrawal',
+                withdrawal: 'Withdrawal'
+            },
+            basContainer: {
+                containerType: 'containerType',
+                codeType: 'codeType',
+                areas: 'areas',
+            },
+            basStation: {
+                stationName: 'stationName',
+                inAble: 'inAble',
+                outAble: 'outAble',
+                useStatus: 'useStatus',
+                status: 'status',
+                area: 'area',
+                isCrossZone: 'isCrossZone',
+                crossZoneArea: 'crossZoneArea',
+                isWcs: 'isWcs',
+                wcsData: 'wcsData',
+                containerType: 'containerType',
+                barcode: 'barcode',
+                autoTransfer: 'autoTransfer',
+            },
             host: {
 
             },
@@ -569,12 +604,15 @@
             },
             outStockItem: {
                 asnId: "ID",
-                asnCode: "DO Code",
+                asnCode: "Out Code",
+                poCode: 'DO Code',
                 poDetlId: "poDetlId",
                 poDetlCode: "DO Detl Code",
                 matnrId: "matnrId",
                 maktx: "maktx",
+                workQty: 'Work Qty',
                 anfme: "anfme",
+                platOrderCode: 'Customer Code',
                 stockUnit: "stockUnit",
                 purQty: "purQty",
                 purUnit: "purUnit",
@@ -595,6 +633,9 @@
                 poDetlCode: "poDetlCode",
                 matnrId: "matnrId",
                 maktx: "maktx",
+                platOrderCode: 'Customer Order Code',
+                platWorkCode: 'Work Code',
+                projectCode: 'Project Code',
                 spec: "Spec",
                 model: "Model",
                 anfme: "anfme",
@@ -690,7 +731,8 @@
                 fieldsIndex: "fieldsIndex",
                 unit: "unit",
                 anfme: "anfme",
-                qty: "qty",
+                workQty: 'Work Qty',
+                qty: "Qty",
                 nromQty: "nromQty",
                 printQty: "printQty",
                 splrName: "splrName",
@@ -735,6 +777,8 @@
                 deviceCode: "deviceCode",
                 deviceSite: "deviceSite",
                 flagInit: "flagInit",
+                wcsCode: "wcsCode",
+                channel: "channel",
             },
             waitPakin: {
                 code: "code",
@@ -818,6 +862,7 @@
                 taskCode: "TaskCode",
                 taskStatus: "Status",
                 taskType: "Type",
+                warehType: "Warehouse Type",
                 orgLoc: "orgLoc",
                 orgSite: "orgSite",
                 targLoc: "targLoc",
@@ -852,6 +897,7 @@
             taskItem: {
                 taskId: "taskId",
                 orderId: "orderId",
+                wkType: 'Work Type',
                 orderType: "orderType",
                 orderItemId: "orderItemId",
                 sourceCode: "sourceCode",
@@ -864,6 +910,36 @@
                 batch: "batch",
                 spec: "spec",
                 model: "model",
+            },
+            stock: {
+                code: "Code",
+                sourceCode: "Resource",
+                sourceId: "Resource ID",
+                type: "Order Type",
+                wkType: "Work Type",
+                anfme: "Qty",
+            },
+            stockItem: {
+                orderId: "Order ID",
+                orderCode: "Order Code",
+                sourceItemId: "Resource Item ID",
+                matnrId: "Mat ID",
+                matnrCode: "Mat Code",
+                maktx: "Maktx",
+                anfme: "Anfme",
+                stockUnit: "Unit",
+                workQty: "Work Qty",
+                purQty: "Purchase Qty",
+                purUnit: "Purchase Unit",
+                qty: "Qty",
+                splrCode: "Supplier Code",
+                batch: "Batch",
+                splrBatch: "Supplier Batch",
+                splrName: "Supplier Name",
+                trackCode: "Track Code",
+                barcode: "Bar Code",
+                prodTime: "Prod Time",
+                packName: "Pakcage",
             },
             taskItemLog: {
                 taskItemId: "taskItemId",
@@ -918,12 +994,16 @@
                 type: "type",
                 orderItemId: "orderItemId",
                 wkType: "wkType",
+                aggType: "Agg Type",
                 matnrId: "matnrId",
+                wareArea: 'Warehouse Areas',
                 maktx: "maktx",
                 matnrCode: "matnrCode",
                 trackCode: "trackCode",
                 unit: "unit",
                 anfme: "anfme",
+                qty: 'Qty',
+                workQty: 'Work Qty',
                 batch: "batch",
                 splrBatch: "splrBatch",
                 spec: "spec",
@@ -943,6 +1023,7 @@
                 unit: 'Unit',
                 anfme: 'Stock Qty',
                 matnrCode: "Matnr Code",
+                warehouse: 'Warehouse',
                 workQty: 'Work Qty',
                 qty: 'Non Stock Qty',
                 splrId: 'supplier',
@@ -962,6 +1043,11 @@
                 typeId: "typeId",
                 beSimilar: "beSimilar",
                 emptySimilar: "emptySimilar",
+            },
+            waveRule: {
+                code: "code",
+                type: "type",
+                name: "name",
             },
         }
     },
@@ -1048,6 +1134,8 @@
         locInit: 'loc init',
         siteInit: 'site init',
         batch: 'batch',
+        pick: 'Pick',
+        check: 'Check',
         confirm: 'confirm',
         cancel: "cancel",
         query: "Query",
@@ -1076,6 +1164,7 @@
         asnCreate: "Create By Order",
         poCreate: "Create By PO",
         createTask: "createTask",
+        publicWorking: 'Public Working',
         recover: "recover",
         createWave: "Create Wave",
         order: 'Orders',
@@ -1085,6 +1174,8 @@
         error: {
             stock: "Insufficient inventory to deliver 锛侊紒",
             select_error_order: "Please Select Asn Orders",
+            out_stock_qty: "The outbound quantity cannot be greater than the inventory quantity",
+
         }
 
     }

--
Gitblit v1.9.1