From e34cc8847f742e08106fae37fdf1dd91cd0aa170 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 28 五月 2025 12:56:20 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/en.js |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index a286aa8..4f6fb83 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -202,10 +202,35 @@
         deviceBind: 'Device Bind',
         tasks: 'Tasks',
         wave: 'Wave Manage',
-
+        basStation: 'BasStation',
+        basContainer: 'BasContainer',
     },
     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: {
 
             },
@@ -746,6 +771,8 @@
                 deviceCode: "deviceCode",
                 deviceSite: "deviceSite",
                 flagInit: "flagInit",
+                wcsCode: "wcsCode",
+                channel: "channel",
             },
             waitPakin: {
                 code: "code",
@@ -962,11 +989,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",
@@ -1092,6 +1122,8 @@
         locInit: 'loc init',
         siteInit: 'site init',
         batch: 'batch',
+        pick: 'Pick',
+        check: 'Check',
         confirm: 'confirm',
         cancel: "cancel",
         query: "Query",
@@ -1129,6 +1161,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