From 01bdd3d234335a61c849fc53d28eabff29949f33 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 10:40:05 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 8551425..09e744f 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -189,7 +189,7 @@
         taskLog: 'TaskLog',
         orderItem: 'OrderItem',
         order: 'Order',
-        locItem: 'LocItem',
+        locPreview: 'LocItem',
         stock: 'Stock Manage',
         histories: 'Histories',
         wareWork: 'Warehouse Working',
@@ -211,7 +211,8 @@
         waveRule: 'Wave Rules',
         checkDiff: 'Check Diff',
         transfer: 'Transfer',
-
+        locRevise: 'Loc Revise',
+        stockStatistic: 'Stock Statistic',
     },
     table: {
         field: {
@@ -691,6 +692,16 @@
                 projectCode: "projectCode",
             },
 
+            transferOrder: {
+                code: 'Order No',
+                poCode: 'transfer No',
+                type: 'Type',
+                wkType: 'Work Type',
+                anfme: 'Anfme',
+                workQty: 'Work Qty',
+                qty: 'Qty',
+            },
+
             checkDiffItem: {
                 checkId: "checkId",
                 orderCode: "orderCode",
@@ -813,6 +824,18 @@
                 startTime: "startTime",
                 endTime: "endTime",
             },
+          stockStatistic: {
+            id: "id",
+            dayTime: "dayTime",
+            taskType: "taskType",
+            taskStatus: "taskStatus",
+            maktx: "maktx",
+            matnrCode: "matnrCode",
+            count: "count",
+            batch: "batch",
+            anfme: "anfme",
+            unit: "unit",
+          },
             delivery: {
                 code: "code",
                 platId: "platId",
@@ -891,6 +914,20 @@
                 flagDefect: "Defective",
                 anfme: "anfme",
                 ioStatus: "ioStatus",
+            },
+            locRevise: {
+                code: "code",
+                type: "type",
+                anfme: "anfme",
+                reviseQty: "Revise Qty",
+                exceStatus: "Exce Status",
+                orgAreaId: "Area Id",
+                orgAreaName: "Area Name",
+                exceTime: "Exce Time"
+            },
+            reviseLog: {
+                reviseId: 'Revise Id',
+                reviseCode: 'Revise Code',
             },
             waitPakinItem: {
                 pakinId: "pakinId",
@@ -1006,7 +1043,6 @@
                 wkType: 'Work Type',
                 orderType: "orderType",
                 orderItemId: "orderItemId",
-                sourceCode: "sourceCode",
                 matnrId: "matnrId",
                 maktx: "maktx",
                 matnrCode: "matnrCode",
@@ -1109,8 +1145,10 @@
                 trackCode: "trackCode",
                 unit: "unit",
                 anfme: "anfme",
+                outQty: 'Revise Qty',
                 qty: 'Qty',
                 workQty: 'Work Qty',
+                reviseQty: 'Revise Qty',
                 batch: "batch",
                 splrBatch: "splrBatch",
                 spec: "spec",
@@ -1271,6 +1309,7 @@
         complete: "complete",
         allComfirm: 'All Comfirm',
         createTransfer: 'Create Transfer Order',
+        createLocRevise: 'Create Stock Revise Order',
         verifyComfirm: 'Verify Comfirm',
         close: "close",
         asnCreate: "Create By Order",

--
Gitblit v1.9.1