From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 3f3392d..daf2177 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -155,6 +155,8 @@
         waitPakinItem: 'WaitPakinItem',
         task: 'Task',
         taskItem: 'TaskItem',
+        taskItemLog: 'TaskItemLog',
+        taskLog: 'TaskLog',
     },
     table: {
         field: {
@@ -684,6 +686,24 @@
                 startTime: "startTime",
                 endTime: "endTime",
             },
+            taskLog: {
+                taskId: "taskId",
+                taskCode: "taskCode",
+                taskStatus: "taskStatus",
+                taskType: "taskType",
+                orgLoc: "orgLoc",
+                orgSite: "orgSite",
+                targLoc: "targLoc",
+                targSite: "targSite",
+                barcode: "barcode",
+                robotCode: "robotCode",
+                exceStatus: "exceStatus",
+                expDesc: "expDesc",
+                sort: "sort",
+                expCode: "expCode",
+                startTime: "startTime",
+                endTime: "endTime",
+            },
             taskItem: {
                 taskId: "taskId",
                 orderId: "orderId",
@@ -693,6 +713,23 @@
                 matnrId: "matnrId",
                 maktx: "maktx",
                 matnrCode: "matnrCode",
+                unit: "unit",
+                anfme: "anfme",
+                batch: "batch",
+                spec: "spec",
+                model: "model",
+            },
+            taskItemLog: {
+                taskItemId: "taskItemId",
+                taskId: "taskId",
+                orderId: "orderId",
+                orderType: "orderType",
+                orderItemId: "orderItemId",
+                source: "source",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                matnrCode: "matnrCode",
+                trackCode: "trackCode",
                 unit: "unit",
                 anfme: "anfme",
                 batch: "batch",
@@ -802,6 +839,8 @@
         complete: "complete",
         close: "close",
         asnCreate: "asnCreate",
+        createTask: "createTask",
+        recover: "recover",
     },
 };
 

--
Gitblit v1.9.1