From f6d1bccd9148413612801d4ff6ac5d629564a642 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 28 二月 2026 13:53:48 +0800
Subject: [PATCH] #
---
version/db/new.sql | 8 +++-
zy-acs-flow/src/page/agvModel/AgvModelPanel.jsx | 12 ++++++
zy-acs-flow/src/i18n/en.js | 2 +
zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx | 14 +++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java | 12 ++++++
zy-acs-flow/src/i18n/zh.js | 2 +
zy-acs-flow/src/page/agvModel/AgvModelList.jsx | 7 +++
zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx | 10 ++++
zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx | 12 ++++++
9 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index 6602b0b..7e918df 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -14,8 +14,6 @@
ON man_travel (agv_id, state, roller_waiting, deleted);
-
-
alter table man_sta
add height decimal(24, 9) null comment '浣滀笟楂樺害' after offset;
@@ -91,3 +89,9 @@
)
charset = utf8;
+
+alter table man_agv_model
+ add head_offset int(11) null comment '杞﹀ご(姣背)' after length;
+
+alter table man_agv_model
+ add tail_offset int(11) null comment '杞﹀熬(姣背)' after head_offset;
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index ed46a89..c1c47d2 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -366,6 +366,8 @@
type: "model type",
name: "model name",
length: "length",
+ headOffset: "head (mm)",
+ tailOffset: "tail (mm)",
width: "width",
height: "height",
liftHeight: "lift height",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 3f31d4a..dfe7bd8 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -366,6 +366,8 @@
type: "杞︾被鍨�",
name: "杞﹀瀷鍚�",
length: "闀垮害",
+ headOffset: "杞﹀ご(姣背)",
+ tailOffset: "杞﹀熬(姣背)",
width: "瀹藉害",
height: "楂樺害",
liftHeight: "涓惧崌楂樺害",
diff --git a/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx b/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx
index 6df36d8..75dcc54 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowDetail.jsx
@@ -205,6 +205,14 @@
<DetailValue value={record.agvModelData.length} />
</Grid>
<Grid item xs={ITEM_COL}>
+ <DetailTitle title='table.field.agvModel.headOffset' />
+ <DetailValue value={record.agvModelData.headOffset} />
+ </Grid>
+ <Grid item xs={ITEM_COL}>
+ <DetailTitle title='table.field.agvModel.tailOffset' />
+ <DetailValue value={record.agvModelData.tailOffset} />
+ </Grid>
+ <Grid item xs={ITEM_COL}>
<DetailTitle title='table.field.agvModel.width' />
<DetailValue value={record.agvModelData.width} />
</Grid>
@@ -254,4 +262,4 @@
</Grid>
</Grid>
)
-}
\ No newline at end of file
+}
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
index cbd0f58..2b28c0e 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
@@ -116,6 +116,20 @@
</Grid>
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
+ label="table.field.agvModel.headOffset"
+ source="headOffset"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={4} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.agvModel.tailOffset"
+ source="tailOffset"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={4} display="flex" gap={1}>
+ <NumberInput
label="table.field.agvModel.width"
source="width"
/>
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx b/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
index 5b78e04..ea16391 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
@@ -89,6 +89,18 @@
source="length"
/>
<NumberInput
+ label="table.field.agvModel.headOffset"
+ source="headOffset"
+ validate={required()}
+ />
+ <NumberInput
+ label="table.field.agvModel.tailOffset"
+ source="tailOffset"
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
label="table.field.agvModel.width"
source="width"
/>
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelList.jsx b/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
index 8297181..f745933 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
@@ -66,6 +66,8 @@
<TextInput source="type" label="table.field.agvModel.type" />,
<TextInput source="name" label="table.field.agvModel.name" />,
<NumberInput source="length" label="table.field.agvModel.length" />,
+ <NumberInput source="headOffset" label="table.field.agvModel.headOffset" />,
+ <NumberInput source="tailOffset" label="table.field.agvModel.tailOffset" />,
<NumberInput source="width" label="table.field.agvModel.width" />,
<NumberInput source="height" label="table.field.agvModel.height" />,
<NumberInput source="liftHeight" label="table.field.agvModel.liftHeight" />,
@@ -135,7 +137,8 @@
expand={() => <AgvModelPanel />}
expandSingle={true}
omit={['id', 'uuid', 'liftHeight', 'mqttTopic', 'password', 'protocol'
- , 'length', 'width', 'height', 'allDirectionBool'
+ // , 'headOffset', 'tailOffset'
+ , 'length', 'width', 'height', 'allDirectionBool', 'diameter'
, 'statusBool', 'updateBy', 'updateTime', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -143,6 +146,8 @@
<TextField source="name" label="table.field.agvModel.name" />
<TextField source="type" label="table.field.agvModel.type" />
<NumberField source="length" label="table.field.agvModel.length" />
+ <NumberField source="headOffset" label="table.field.agvModel.headOffset" />
+ <NumberField source="tailOffset" label="table.field.agvModel.tailOffset" />
<NumberField source="width" label="table.field.agvModel.width" />
<NumberField source="height" label="table.field.agvModel.height" />
<NumberField source="liftHeight" label="table.field.agvModel.liftHeight" />
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelPanel.jsx b/zy-acs-flow/src/page/agvModel/AgvModelPanel.jsx
index 39f4e31..e12a253 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelPanel.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelPanel.jsx
@@ -66,6 +66,18 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
+ title="table.field.agvModel.headOffset"
+ property={record.headOffset}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.agvModel.tailOffset"
+ property={record.tailOffset}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
title="table.field.agvModel.width"
property={record.width}
/>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
index a0d241c..9de6e33 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvModel.java
@@ -47,6 +47,18 @@
private Integer length;
/**
+ * 杞﹀ご(姣背)
+ */
+ @ApiModelProperty(value= "杞﹀ご(姣背)")
+ private Integer headOffset;
+
+ /**
+ * 杞﹀熬(姣背)
+ */
+ @ApiModelProperty(value= "杞﹀熬(姣背)")
+ private Integer tailOffset;
+
+ /**
* 瀹藉害
*/
@ApiModelProperty(value= "瀹藉害")
--
Gitblit v1.9.1