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 |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 53ea47c..63c252c 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -204,15 +204,17 @@
         wave: 'Wave Manage',
         basStation: 'BasStation',
         basContainer: 'BasContainer',
+        waveRule: 'Wave Rules',
+
     },
     table: {
         field: {
             outBound: {
                 stockWithdrawal: 'StockWithdrawal',
-                withdrawal:'Withdrawal'
+                withdrawal: 'Withdrawal'
             },
             basContainer: {
-                containerType:'containerType',
+                containerType: 'containerType',
                 codeType: 'codeType',
                 areas: 'areas',
             },
@@ -228,8 +230,8 @@
                 isWcs: 'isWcs',
                 wcsData: 'wcsData',
                 containerType: 'containerType',
-                barcode: 'barcode',  
-                autoTransfer: 'autoTransfer',          
+                barcode: 'barcode',
+                autoTransfer: 'autoTransfer',
             },
             host: {
 
@@ -602,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",
@@ -726,7 +731,8 @@
                 fieldsIndex: "fieldsIndex",
                 unit: "unit",
                 anfme: "anfme",
-                qty: "qty",
+                workQty: 'Work Qty',
+                qty: "Qty",
                 nromQty: "nromQty",
                 printQty: "printQty",
                 splrName: "splrName",
@@ -771,6 +777,8 @@
                 deviceCode: "deviceCode",
                 deviceSite: "deviceSite",
                 flagInit: "flagInit",
+                wcsCode: "wcsCode",
+                channel: "channel",
             },
             waitPakin: {
                 code: "code",
@@ -889,6 +897,7 @@
             taskItem: {
                 taskId: "taskId",
                 orderId: "orderId",
+                wkType: 'Work Type',
                 orderType: "orderType",
                 orderItemId: "orderItemId",
                 sourceCode: "sourceCode",
@@ -987,11 +996,14 @@
                 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",
@@ -1031,6 +1043,11 @@
                 typeId: "typeId",
                 beSimilar: "beSimilar",
                 emptySimilar: "emptySimilar",
+            },
+            waveRule: {
+                code: "code",
+                type: "type",
+                name: "name",
             },
         }
     },
@@ -1117,6 +1134,8 @@
         locInit: 'loc init',
         siteInit: 'site init',
         batch: 'batch',
+        pick: 'Pick',
+        check: 'Check',
         confirm: 'confirm',
         cancel: "cancel",
         query: "Query",
@@ -1145,6 +1164,7 @@
         asnCreate: "Create By Order",
         poCreate: "Create By PO",
         createTask: "createTask",
+        publicWorking: 'Public Working',
         recover: "recover",
         createWave: "Create Wave",
         order: 'Orders',
@@ -1154,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