From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/i18n/en.js |   61 +++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 8ff186a..3e2edf7 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -44,6 +44,7 @@
                 main: 'Main',
                 common: 'Common',
                 changePwd: 'Change Password',
+                insuffInventory: 'Insufficient inventory'
             },
             side: {
                 title: 'More Info'
@@ -78,6 +79,8 @@
                 result: 'Contacts import complete. Imported %{success} success, with %{error} errors',
             },
             loadMore: 'Load More Data',
+            updateSucc: 'Update Success',
+            updateFaild: 'Update Failed',
             complete: 'Complete',
             deprecate: 'Deprecate',
             stockError: 'Empty',
@@ -204,6 +207,8 @@
         wave: 'Wave Manage',
         basStation: 'BasStation',
         basContainer: 'BasContainer',
+        waveRule: 'Wave Rules',
+
     },
     table: {
         field: {
@@ -327,6 +332,7 @@
                 err: "error",
                 result: "result",
                 userId: "user",
+                detail: "detail"
             },
             customer: {
                 uuid: "uuid",
@@ -432,6 +438,7 @@
                 col: "Col",
                 lev: "Lev",
                 channel: "Channel",
+                startChannel: "startChannel",
                 maxParts: "MaxParts",
                 maxPack: "MaxPack",
                 flagLabelMange: "FlagLabelMange",
@@ -600,6 +607,41 @@
                 ntyStatus: "Notify",
                 exceStatus: 'bill status'
             },
+            checkOrder: {
+                code: "Check Code",
+                poCode: "Po Code",
+                poId: "Po Id",
+                type: "Type",
+                wkType: "Work Type",
+                anfme: "Anfme",
+                workQty: 'Work Qty',
+                qty: "Qty",
+                logisNo: "Logis No",
+                arrTime: "arrived Time",
+                rleStatus: "閲婃斁鐘舵��",
+                ntyStatus: "涓婃姤鐘舵��",
+                exceStatus: '鍗曟嵁鐘舵��'
+            },
+            checkOrderItem: {
+                orderId: "ID",
+                orderCode: "Out Code",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                workQty: 'Work Qty',
+                anfme: "Anfme",
+                platOrderCode: 'Customer Code',
+                stockUnit: "stockUnit",
+                purQty: "purQty",
+                purUnit: "purUnit",
+                qty: "qty",
+                splrCode: "splrCode",
+                splrName: "splrName",
+                qrcode: "qrcode",
+                barcode: "barcode",
+                packName: "packName",
+                ntyStatus: "ntyStatus",
+                platItemId: 'platItemId'
+            },
             outStockItem: {
                 asnId: "ID",
                 asnCode: "Out Code",
@@ -647,7 +689,7 @@
                 disQty: 'Def Qty',
                 splrCode: "splrCode",
                 splrName: "splrName",
-                isptResult: "Ispt Result",
+                isptStatus: "Ispt Status",
                 qrcode: "qrcode",
                 barcode: "barcode",
                 packName: "packName",
@@ -775,7 +817,6 @@
                 deviceCode: "deviceCode",
                 deviceSite: "deviceSite",
                 flagInit: "flagInit",
-                wcsCode: "wcsCode",
                 channel: "channel",
             },
             waitPakin: {
@@ -833,8 +874,10 @@
                 type: "type",
                 exceStatus: "exceStatus",
                 anfme: "anfme",
+                groupQty: 'Group Qty',
                 qty: "qty",
                 orderNum: "orderNum",
+                progress:"progress"
             },
             waveItem: {
                 waveId: "waveId",
@@ -843,6 +886,7 @@
                 matnrName: "matnrName",
                 matnrCode: "matnrCode",
                 batch: "batch",
+                exceStatus: 'Exce Status',
                 splrBatch: "splrBatch",
                 orderCode: "orderCode",
                 orderItemId: "orderItemId",
@@ -1011,7 +1055,6 @@
             warehouseStock: {
                 locId: "Loc ID",
                 locCode: "Code",
-                warehouse: 'Warehouse',
                 orderId: "Order Id",
                 type: "Type",
                 orderItemId: "Order Detail ID",
@@ -1041,6 +1084,11 @@
                 typeId: "typeId",
                 beSimilar: "beSimilar",
                 emptySimilar: "emptySimilar",
+            },
+            waveRule: {
+                code: "code",
+                type: "type",
+                name: "name",
             },
         }
     },
@@ -1138,6 +1186,9 @@
         selectSite: 'Select Site',
         top: "top",
         resort: "sort",
+        start: 'Start',
+        stopPub: 'Stop Pub',
+        pause: 'Pause',
         subzone: 'subzone',
         bindmatnr: 'bind matnr',
         bindloc: 'bind loc',
@@ -1152,15 +1203,19 @@
         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: {

--
Gitblit v1.9.1