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

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

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index a9f29d4..3f3392d 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -134,6 +134,7 @@
         container: 'Container',
         contract: 'Contract',
         qlyInspect: 'QlyInspect',
+        qlyIsptItem: '璐ㄦ淇℃伅鏄庣粏',
         dictType: 'DictType',
         dictData: 'DictData',
         companys: 'Companys',
@@ -152,6 +153,8 @@
         deviceSite: 'deviceSite',
         waitPakin: 'WaitPakin',
         waitPakinItem: 'WaitPakinItem',
+        task: 'Task',
+        taskItem: 'TaskItem',
     },
     table: {
         field: {
@@ -409,12 +412,15 @@
                 projectName: "ProjectName",
             },
             qlyInspect: {
+                asnId: "asnId",
+                asnCode: "asnCode",
                 code: "code",
                 wkType: "wkType",
                 safeQty: "safeQty",
                 dlyQty: "dlyQty",
                 rcptQty: "rcptQty",
                 isptQty: "isptQty",
+                isptStatus: "isptStatus",
             },
             qlyIsptItem: {
                 ispectId: "ispectId",
@@ -424,11 +430,13 @@
                 splrName: "splrName",
                 splrBatch: "splrBatch",
                 stockBatch: "stockBatch",
+                isptResult: 'isptResult',
                 rcptQty: "rcptQty",
                 dlyQty: "dlyQty",
                 disQty: "disQty",
                 safeQty: "safeQty",
                 picPath: "picPath",
+                trackCode: "trackCode",
             },
             dictType: {
                 code: "Code",
@@ -515,6 +523,7 @@
                 barcode: "barcode",
                 packName: "packName",
                 ntyStatus: "ntyStatus",
+                platItemId: 'platItemId'
             },
             asnOrderLog: {
                 code: "code",
@@ -623,6 +632,10 @@
                 maktx: "maktx",
                 matnrId: "matnrId",
                 matnrCode: "matnrCode",
+                asnId: "asnId",
+                asnCode: "asnCode",
+                asnItemId: "asnItemId",
+                trackCode: "trackCode",
                 anfme: "anfme",
                 workQty: "workQty",
                 unit: "unit",
@@ -653,6 +666,38 @@
                 fieldsIndex: "fieldsIndex",
                 qty: "qty",
                 batch: "batch",
+            },
+            task: {
+                taskCode: "TaskCode",
+                taskStatus: "Status",
+                taskType: "Type",
+                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",
+                orderType: "orderType",
+                orderItemId: "orderItemId",
+                sourceCode: "sourceCode",
+                matnrId: "matnrId",
+                maktx: "maktx",
+                matnrCode: "matnrCode",
+                unit: "unit",
+                anfme: "anfme",
+                batch: "batch",
+                spec: "spec",
+                model: "model",
             },
         }
     },
@@ -739,6 +784,9 @@
         siteInit: 'site init',
         batch: 'batch',
         confirm: 'confirm',
+        cancel: "cancel",
+        top: "top",
+        resort: "sort",
         subzone: 'subzone',
         bindmatnr: 'bind matnr',
         bindloc: 'bind loc',
@@ -750,6 +798,10 @@
         batchWarehouseAreas: "batchWarehouseAreas",
         batchLocType: "batchLocType",
         batchPrint: "batch print",
+        quality: "quality",
+        complete: "complete",
+        close: "close",
+        asnCreate: "asnCreate",
     },
 };
 

--
Gitblit v1.9.1