From f2b48ce0cfdf9b68ecc7c9d84937d69500590f81 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:28 +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, 33 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 792b9ea..1891dfd 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -11,6 +11,8 @@
         },
         button: {
             edit: "Edit",
+            detail: "Details",
+            histories: "Histories",
         },
         field: {
             id: 'ID',
@@ -30,6 +32,9 @@
             partners: 'Strategic Partners',
         },
         list: {
+            titles: {
+                stockInfo: 'Stock Details',
+            },
             empty: {
                 tip: 'No data to display',
             }
@@ -79,7 +84,9 @@
             inputPlaceholder: 'Use commas to separate',
             resend: 'RESEND',
             selected: 'selected',
-            batch: 'batch'
+            batch: 'batch',
+            batchSafe: 'Bulk Safe',
+            batchDef: 'Bulk Def',
         },
         msg: {
             confirm: {
@@ -183,6 +190,7 @@
         outStockItem: 'Out Stock Item',
         inStockPoces: 'In Stock Pocess',
         outStockPoces: 'Out Stock Pocess',
+        warehouseStock: 'Instant Inventory',
         deviceBind: 'Device Bind',
         tasks: 'Tasks',
         wave: 'Wave Manage',
@@ -471,6 +479,7 @@
                 rcptQty: "rcptQty",
                 dlyQty: "dlyQty",
                 disQty: "disQty",
+                anfme: 'anfme',
                 safeQty: "safeQty",
                 picPath: "picPath",
                 trackCode: "trackCode",
@@ -921,6 +930,27 @@
                 model: "model",
                 fieldsIndex: "fieldsIndex",
             },
+            warehouseStock: {
+                locId: "Loc ID",
+                locCode: "Code",
+                warehouse: 'Warehouse',
+                orderId: "Order Id",
+                type: "Type",
+                orderItemId: "Order Detail ID",
+                wkType: "Work Type",
+                matnrId: "Matnr Id",
+                maktx: "Mats Name",
+                unit: 'Unit',
+                anfme: 'Stock Qty',
+                matnrCode: "Matnr Code",
+                workQty: 'Work Qty',
+                qty: 'Non Stock Qty',
+                splrId: 'supplier',
+                batch: "Supplier Batch",
+                spec: "Spec",
+                model: "Model",
+                fieldsIndex: "Fields Index",
+            },
             deviceBind: {
                 currentRow: "currentRow",
                 startRow: "startRow",
@@ -1041,8 +1071,10 @@
         orderPrint: 'Orders Print',
         quality: "quality",
         complete: "complete",
+        verifyComfirm: 'Verify Comfirm',
         close: "close",
         asnCreate: "Create By Order",
+        poCreate: "Create By PO",
         createTask: "createTask",
         recover: "recover",
         createWave: "Create Wave",

--
Gitblit v1.9.1