From eeb96ed3c9830f996dc85cc9d4a8113aba91692b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 30 六月 2025 12:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

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

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 1d4627b..17125dc 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -437,6 +437,7 @@
                 col: "Col",
                 lev: "Lev",
                 channel: "Channel",
+                startChannel: "startChannel",
                 maxParts: "MaxParts",
                 maxPack: "MaxPack",
                 flagLabelMange: "FlagLabelMange",
@@ -837,6 +838,7 @@
                 type: "type",
                 exceStatus: "exceStatus",
                 anfme: "anfme",
+                groupQty: 'Group Qty',
                 qty: "qty",
                 orderNum: "orderNum",
             },
@@ -847,6 +849,7 @@
                 matnrName: "matnrName",
                 matnrCode: "matnrCode",
                 batch: "batch",
+                exceStatus: 'Exce Status',
                 splrBatch: "splrBatch",
                 orderCode: "orderCode",
                 orderItemId: "orderItemId",
@@ -1146,6 +1149,8 @@
         selectSite: 'Select Site',
         top: "top",
         resort: "sort",
+        start: 'Start',
+        pause: 'Pause',
         subzone: 'subzone',
         bindmatnr: 'bind matnr',
         bindloc: 'bind loc',
@@ -1160,16 +1165,20 @@
         orderPrint: 'Orders Print',
         quality: "quality",
         complete: "complete",
+        allComfirm: 'All Comfirm',
         verifyComfirm: 'Verify Comfirm',
         close: "close",
         asnCreate: "Create By Order",
         poCreate: "Create By PO",
         createTask: "createTask",
         publicWorking: 'Public Working',
+        continuePub: 'Continue Public',
         recover: "recover",
         createWave: "Create Wave",
         order: 'Orders',
         modiftySite: 'Modify SiteNo',
+        selectWave: 'Select Wave Rule',
+
     },
     request: {
         error: {

--
Gitblit v1.9.1