From 5f6a52bb812a322c22ccefaf00cadde7bcb125d5 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 26 一月 2026 11:20:44 +0800
Subject: [PATCH] #
---
version/db/new.sql | 9 ++++
zy-acs-flow/src/page/sta/StaEdit.jsx | 34 +++++++++++-----
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 6 +++
zy-acs-flow/src/page/sta/StaCreate.jsx | 16 +++++++
zy-acs-flow/src/page/sta/StaPanel.jsx | 4 +
zy-acs-flow/src/i18n/en.js | 2 +
zy-acs-flow/src/page/sta/StaList.jsx | 4 +
zy-acs-flow/src/i18n/zh.js | 2 +
8 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index b51e0e9..ba7ca0b 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -12,3 +12,12 @@
CREATE INDEX idx_agv_state_wait
ON man_travel (agv_id, state, roller_waiting, deleted);
+
+
+
+
+alter table man_sta
+ add height decimal(24, 9) null comment '浣滀笟楂樺害' after offset;
+
+alter table man_sta
+ add depth decimal(24, 9) null comment '浣滀笟娣卞害' after height;
\ 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 639c74a..26a953c 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -287,6 +287,8 @@
staType: "station type",
code: "code",
offset: "offset",
+ hight: "hight",
+ depth: "depth",
angle: 'angle',
autoing: "autoing",
loading: "loading",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 8b63137..3d7060d 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -287,6 +287,8 @@
staType: "绔欑偣绫诲瀷",
code: "鍦伴潰鐮�",
offset: "鍋忕Щ閲�",
+ hight: "浣滀笟楂樺害",
+ depth: "浣滀笟娣卞害",
angle: '浣滀笟瑙掑害',
autoing: "鑷姩",
loading: "杞借揣",
diff --git a/zy-acs-flow/src/page/sta/StaCreate.jsx b/zy-acs-flow/src/page/sta/StaCreate.jsx
index 7eec5ab..6fc6557 100644
--- a/zy-acs-flow/src/page/sta/StaCreate.jsx
+++ b/zy-acs-flow/src/page/sta/StaCreate.jsx
@@ -153,12 +153,26 @@
validate={required()}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.sta.offset"
source="offset"
validate={required()}
/>
+ </Grid> */}
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.sta.hight"
+ source="hight"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.sta.depth"
+ source="depth"
+ validate={required()}
+ />
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
diff --git a/zy-acs-flow/src/page/sta/StaEdit.jsx b/zy-acs-flow/src/page/sta/StaEdit.jsx
index a203a00..004e34a 100644
--- a/zy-acs-flow/src/page/sta/StaEdit.jsx
+++ b/zy-acs-flow/src/page/sta/StaEdit.jsx
@@ -130,17 +130,29 @@
validate={required()}
/>
<NumberInput
- label="table.field.sta.offset"
- source="offset"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
label="table.field.sta.angle"
source="angle"
validate={required()}
/>
+ {/* <NumberInput
+ label="table.field.sta.offset"
+ source="offset"
+ validate={required()}
+ /> */}
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.sta.hight"
+ source="hight"
+ validate={required()}
+ />
+ <NumberInput
+ label="table.field.sta.depth"
+ source="depth"
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
{/* <NumberInput
label="table.field.sta.occCnt"
source="occCnt"
@@ -152,14 +164,14 @@
<NumberInput
label="table.field.sta.rsvInCnt"
source="rsvInCnt"
- // InputProps={{ readOnly: true }}
- // disabled
+ // InputProps={{ readOnly: true }}
+ // disabled
/>
<NumberInput
label="table.field.sta.rsvOutCnt"
source="rsvOutCnt"
- // InputProps={{ readOnly: true }}
- // disabled
+ // InputProps={{ readOnly: true }}
+ // disabled
/>
</Stack>
</Grid>
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index d5475ac..39e41cf 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -134,7 +134,7 @@
expand={() => <StaPanel />}
expandSingle={true}
rowSx={rowSx(drawerVal || null)}
- omit={['id', 'uuid', 'name', 'zpallet', 'updateBy', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'name', 'offset', 'zpallet', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
@@ -157,6 +157,8 @@
<NumberField source="rsvInCnt" label="table.field.sta.rsvInCnt" />
<NumberField source="rsvOutCnt" label="table.field.sta.rsvOutCnt" />
<NumberField source="offset" label="table.field.sta.offset" />
+ <NumberField source="hight" label="table.field.sta.hight" />
+ <NumberField source="depth" label="table.field.sta.depth" />
<NumberField source="angle" label="table.field.sta.angle" />
{/* <TextField source="autoing" label="table.field.sta.autoing" />
<TextField source="loading" label="table.field.sta.loading" />
diff --git a/zy-acs-flow/src/page/sta/StaPanel.jsx b/zy-acs-flow/src/page/sta/StaPanel.jsx
index b247569..49a314c 100644
--- a/zy-acs-flow/src/page/sta/StaPanel.jsx
+++ b/zy-acs-flow/src/page/sta/StaPanel.jsx
@@ -41,7 +41,9 @@
{ labelKey: 'table.field.sta.capacity', valueKey: 'capacity' },
{ labelKey: 'table.field.sta.rsvInCnt', valueKey: 'rsvInCnt' },
{ labelKey: 'table.field.sta.rsvOutCnt', valueKey: 'rsvOutCnt' },
- { labelKey: 'table.field.sta.offset', valueKey: 'offset' },
+ // { labelKey: 'table.field.sta.offset', valueKey: 'offset' },
+ { labelKey: 'table.field.sta.height', valueKey: 'height' },
+ { labelKey: 'table.field.sta.depth', valueKey: 'depth' },
{ labelKey: 'table.field.sta.zpallet', valueKey: 'zpallet' },
];
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 ff9e23a..be68dfa 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
@@ -55,6 +55,12 @@
@ApiModelProperty(value= "鍋忕Щ閲�")
private Double offset;
+ @ApiModelProperty(value= "浣滀笟楂樺害")
+ private Double height;
+
+ @ApiModelProperty(value= "浣滀笟娣卞害")
+ private Double depth;
+
@ApiModelProperty(value= "浣滀笟瑙掑害")
private String angle;
--
Gitblit v1.9.1