From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55: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 |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index bdd97fd..0e4768d 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -24,6 +24,10 @@
             memoWrap: 'memo wrap',
             memo: 'memo',
             opt: 'operate',
+            supplier: 'Supplier',
+            customer: 'Customer',
+            shipper: 'Shipper',
+            partners: 'Strategic Partners',
         },
         list: {
             empty: {
@@ -56,6 +60,7 @@
             expand: 'Expand',
             expandAll: 'Expand All',
             collapse: 'Collapse',
+            newAddMats: 'New Mats',
             collapseAll: 'Collapse All',
             scope: 'Assign',
             import: {
@@ -70,6 +75,7 @@
             loadMore: 'Load More Data',
             complete: 'Complete',
             deprecate: 'Deprecate',
+            stockError: 'Empty',
             inputPlaceholder: 'Use commas to separate',
             resend: 'RESEND',
             selected: 'selected',
@@ -343,6 +349,7 @@
                 flagMix: "flagMix",
             },
             warehouseAreasItem: {
+                asnCode: 'Order NO.',
                 areaId: "areaId",
                 areaName: "areaName",
                 matnrId: "matnrId",
@@ -351,6 +358,9 @@
                 fieldsIndex: "fieldsIndex",
                 barcode: "barcode",
                 anfme: "anfme",
+                isptResult: 'Ispt Result',
+                workQty: 'Work Qty',
+                qty: 'Available',
                 batch: "batch",
                 unit: "unit",
                 stockUnit: "stockUnit",
@@ -531,11 +541,25 @@
                 ntyStatus: "Notify",
                 exceStatus: 'bill status'
             },
-            asnOrderItem: {
-                asnId: "asnId",
-                asnCode: "asnCode",
+            outStock: {
+                code: "Code",
+                poCode: "poCode",
+                poId: "doId",
+                type: "Type",
+                wkType: "wkType",
+                anfme: "anfme",
+                qty: "qty",
+                logisNo: "logisNo",
+                arrTime: "Arrived",
+                rleStatus: "Release",
+                ntyStatus: "Notify",
+                exceStatus: 'bill status'
+            },
+            outStockItem: {
+                asnId: "ID",
+                asnCode: "DO Code",
                 poDetlId: "poDetlId",
-                poDetlCode: "poDetlCode",
+                poDetlCode: "DO Detl Code",
                 matnrId: "matnrId",
                 maktx: "maktx",
                 anfme: "anfme",
@@ -550,6 +574,33 @@
                 packName: "packName",
                 ntyStatus: "ntyStatus",
                 platItemId: 'platItemId'
+            },
+            asnOrderItem: {
+                asnId: "asnId",
+                asnCode: "asnCode",
+                poDetlId: "poDetlId",
+                platItemId: 'platItemId',
+                poDetlCode: "poDetlCode",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                spec: "Spec",
+                model: "Model",
+                anfme: "anfme",
+                stockUnit: "stockUnit",
+                purQty: "purQty",
+                isptResult: "Ispt Result",
+                purUnit: "purUnit",
+                unit: 'Unit',
+                qty: "qty",
+                safeQty: 'Safe Qty',
+                disQty: 'Def Qty',
+                splrCode: "splrCode",
+                splrName: "splrName",
+                isptResult: "Ispt Result",
+                qrcode: "qrcode",
+                barcode: "barcode",
+                packName: "packName",
+                ntyStatus: "ntyStatus",
             },
             asnOrderLog: {
                 code: "code",
@@ -691,6 +742,7 @@
                 asnCode: "asnCode",
                 asnItemId: "asnItemId",
                 trackCode: "trackCode",
+                isptResult: 'Ispt Result',
                 anfme: "anfme",
                 workQty: "workQty",
                 unit: "unit",
@@ -745,6 +797,10 @@
                 fieldsIndex: "fieldsIndex",
                 anfme: "anfme",
                 workQty: "workQty",
+                qty: "Qty",
+                stockLocs: "Stock Locs",
+                stockQty: "Stock Qty",
+
             },
             task: {
                 taskCode: "TaskCode",
@@ -790,6 +846,7 @@
                 matnrId: "matnrId",
                 maktx: "maktx",
                 matnrCode: "matnrCode",
+                isptResult: 'Ispt Result',
                 unit: "unit",
                 anfme: "anfme",
                 batch: "batch",
@@ -988,6 +1045,14 @@
         order: 'Orders',
 
     },
+    request: {
+        error: {
+            stock: "Insufficient inventory to deliver 锛侊紒",
+            select_error_order: "Please Select Asn Orders",
+        }
+
+    }
+
 };
 
 export default customEnglishMessages;

--
Gitblit v1.9.1