From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5

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

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index ce9f2cb..ab6ed0e 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -137,6 +137,7 @@
         title: 'Update'
     },
     menu: {
+        basStationArea: 'BasStationArea',
         dashboard: 'Dashboard',
         settings: 'Settings',
         basicInfo: 'BasicInfo',
@@ -149,6 +150,14 @@
         token: 'Token',
         operation: 'Operation',
         config: 'Config',
+        aiParam: 'AI Params',
+        aiPrompt: 'AI Prompt',
+        aiDiagnosis: 'AI Diagnosis',
+        aiDiagnosisPlan: 'AI Diagnosis Plan',
+        aiCallLog: 'AI Call Log',
+        aiRoute: 'AI Route',
+        aiToolConfig: 'AI Diagnostic Tool',
+        aiMcpMount: 'AI MCP Mount',
         tenant: 'Tenant',
         userLogin: 'Token',
         customer: 'Customer',
@@ -224,9 +233,46 @@
         taskPathTemplateNode: 'TaskPathTemplateNode',
         subsystemFlowTemplate: 'SubsystemFlowTemplate',
         flowStepTemplate: 'FlowStepTemplate',
+        taskPathTemplateMerge: 'TaskPathTemplateMerge',
+        missionFlowStepInstance: 'Mission Flow Steps',
     },
     table: {
         field: {
+            basStationArea: {
+                type: "type",
+                stationAreaName: "stationAreaName",
+                inAble: "inAble",
+                outAble: "outAble",
+                useStatus: "useStatus",
+                area: "area",
+                isCrossZone: "isCrossZone",
+                crossZoneArea: "crossZoneArea",
+                isWcs: "isWcs",
+                wcsData: "wcsData",
+                containerType: "containerType",
+                barcode: "barcode",
+                autoTransfer: "autoTransfer",
+                stationAreaId: "stationAreaId",
+                stationAlias: "stationAlias",
+            },
+            taskPathTemplateMerge: {
+                templateCode: "templateCode",
+                templateName: "templateName",
+                sourceType: "sourceType",
+                targetType: "targetType",
+                conditionExpression: "conditionExpression",
+                conditionDesc: "conditionDesc",
+                version: "version",
+                isCurrent: "isCurrent",
+                effectiveTime: "effectiveTime",
+                expireTime: "expireTime",
+                priority: "priority",
+                timeoutMinutes: "timeoutMinutes",
+                maxRetryTimes: "maxRetryTimes",
+                retryIntervalSeconds: "retryIntervalSeconds",
+                remark: "remark",
+                stepSize: "stepSize",
+            },
             flowStepTemplate: {
                 flowId: "flowId",
                 flowCode: "flowCode",
@@ -243,6 +289,30 @@
                 retryEnabled: "retryEnabled",
                 retryConfig: "retryConfig",
                 timeoutSeconds: "timeoutSeconds",
+            },
+            flowStepInstance: {
+                flowInstanceId: "Flow Instance ID",
+                flowInstanceNo: "Flow Instance No",
+                stepTemplateId: "Step Template ID",
+                errorCode: "Error Code",
+                errorMessage: "Error Message",
+                startTime: "Start Time",
+                endTime: "End Time",
+                durationSeconds: "Duration(s)",
+                inputData: "Input Data",
+                outputData: "Output Data",
+                retryTimes: "Retry Times",
+                id: "ID",
+                stepOrder: "Step Order",
+                stepCode: "Step Code",
+                stepName: "Step Name",
+                stepType: "Step Type",
+                status: "Status",
+                executeResult: "Execute Result",
+                taskNo: "Task No",
+                createTime: "Create Time",
+                wmsNextTaskStatus: "WMS Next Task Status",
+                wmsNowTaskStatus: "WMS Now Task Status",
             },
             subsystemFlowTemplate: {
                 flowCode: "flowCode",
@@ -338,6 +408,19 @@
                 val: "val",
                 content: "content",
                 type: "type",
+            },
+            aiParam: {
+                uuid: "uuid",
+                name: "name",
+                modelCode: "model code",
+                provider: "provider",
+                chatUrl: "chat url",
+                apiKey: "api key",
+                modelName: "model name",
+                systemPrompt: "system prompt",
+                maxContextMessages: "max context",
+                defaultFlag: "default",
+                sort: "sort",
             },
             tenant: {
                 name: "name",
@@ -1421,12 +1504,14 @@
         locInit: 'loc init',
         init: "Init",
         siteInit: 'site init',
+        pathInit: 'Path init',
         batch: 'batch',
         pick: 'Pick',
         check: 'Check',
         confirm: 'confirm',
         cancel: "cancel",
         delete: 'Delete',
+        copy: 'copy',
         query: "Query",
         bulkExport: "Bulk Export",
         continue: 'Continue Receipt',
@@ -1467,6 +1552,8 @@
         order: 'Orders',
         modiftySite: 'Modify SiteNo',
         selectWave: 'Select Wave Rule',
+        flowStep: "Flow Step",
+        jumpCurrent: "Jump To Current",
 
     },
     placeholder: {

--
Gitblit v1.9.1