From 3c65b4169a1bf08c94a58eef551d4c8466d21aab Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 10:56:43 +0800
Subject: [PATCH] #
---
version/db/new.sql | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 3 +++
zy-acs-flow/src/i18n/en.js | 1 +
zy-acs-flow/src/i18n/zh.js | 3 ++-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index 8518d65..f8396a3 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -62,4 +62,4 @@
update man_loc set comp_direct =2 where comp_direct =0
alter table man_sta
- add act_dir int(1) null comment '浣滀笟鏂瑰悜' after angle;
\ No newline at end of file
+ add act_dir int(1) null comment '璐у弶鏂瑰悜' after angle;
\ No newline at end of file
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index ebcb642..340ffce 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -292,6 +292,7 @@
height: "height",
depth: "depth",
angle: 'angle',
+ actDir: 'actuator direction',
inboundWait: 'inbound wait(ms)',
outboundWait: 'outbound wait(ms)',
autoing: "autoing",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 51cb839..49a0565 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -291,7 +291,8 @@
offset: "鍋忕Щ閲�",
height: "浣滀笟楂樺害",
depth: "浣滀笟娣卞害",
- angle: '浣滀笟瑙掑害',
+ angle: '杞︿綋瑙掑害',
+ actDir: '璐у弶鏂瑰悜',
inboundWait: '鍏ュ簱绛夊緟(姣)',
outboundWait: '鍑哄簱绛夊緟(姣)',
autoing: "鑷姩",
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
index 3b1b259..720cd74 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
@@ -65,6 +65,9 @@
@ApiModelProperty(value= "浣滀笟瑙掑害")
private String angle;
+ @ApiModelProperty(value= "璐у弶鏂瑰悜")
+ private Integer actDir;
+
@ApiModelProperty(value= "杩炵画鍏ュ簱绛夊緟(ms)")
private Integer inboundWait;
--
Gitblit v1.9.1