From 0b6213a1d96221669173f43b7a604bc37017472a Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 06 三月 2026 14:31:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/VehicleFootprint.java | 7 ++++---
zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx | 8 +++++---
zy-acs-flow/src/page/agvModel/AgvModelList.jsx | 4 ++--
zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx | 3 +++
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
index 7b95205..20bdd2c 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
@@ -13,6 +13,7 @@
AutocompleteInput,
Toolbar,
required,
+ minValue,
useDataProvider,
useNotify,
Form,
@@ -118,27 +119,28 @@
<NumberInput
label="table.field.agvModel.headOffset"
source="headOffset"
- validate={required()}
+ validate={[required(), minValue(1)]}
/>
</Grid>
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.agvModel.tailOffset"
source="tailOffset"
- validate={required()}
+ validate={[required(), minValue(1)]}
/>
</Grid>
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.agvModel.width"
source="width"
- validate={required()}
+ validate={[required(), minValue(1)]}
/>
</Grid>
<Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.agvModel.height"
source="height"
+ validate={[required(), minValue(1)]}
/>
</Grid>
<Grid item xs={4} display="flex" gap={1}>
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx b/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
index d93b153..9022bc7 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
@@ -92,16 +92,19 @@
label="table.field.agvModel.headOffset"
source="headOffset"
validate={required()}
+ min={1}
/>
<NumberInput
label="table.field.agvModel.tailOffset"
source="tailOffset"
validate={required()}
+ min={1}
/>
<NumberInput
label="table.field.agvModel.width"
source="width"
validate={required()}
+ min={1}
/>
</Stack>
<Stack direction='row' gap={2}>
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelList.jsx b/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
index f745933..d938e40 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
@@ -137,8 +137,8 @@
expand={() => <AgvModelPanel />}
expandSingle={true}
omit={['id', 'uuid', 'liftHeight', 'mqttTopic', 'password', 'protocol'
- // , 'headOffset', 'tailOffset'
- , 'length', 'width', 'height', 'allDirectionBool', 'diameter'
+ // , 'headOffset', 'tailOffset', 'width'
+ , 'length', 'height', 'allDirectionBool', 'diameter'
, 'statusBool', 'updateBy', 'updateTime', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/VehicleFootprint.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/VehicleFootprint.java
index 5622f98..e05f8c6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/VehicleFootprint.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/VehicleFootprint.java
@@ -19,8 +19,9 @@
}
public double maxExtent() {
- double frontDiag = Math.hypot(head, halfWidth);
- double rearDiag = Math.hypot(tail, halfWidth);
- return Math.max(frontDiag, rearDiag);
+// double frontDiag = Math.hypot(head, halfWidth);
+// double rearDiag = Math.hypot(tail, halfWidth);
+// return Math.max(frontDiag, rearDiag);
+ return Math.hypot(Math.max(head, tail), halfWidth);
}
}
--
Gitblit v1.9.1