From a9cf56a7be8b5e27e2c3dcb416b734093e7a8dc3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 28 一月 2026 12:54:15 +0800
Subject: [PATCH] Merge branch 'rcs_master' into ctu_conveyor
---
zy-acs-flow/src/page/sta/StaEdit.jsx | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/page/sta/StaEdit.jsx b/zy-acs-flow/src/page/sta/StaEdit.jsx
index a203a00..fcf3d15 100644
--- a/zy-acs-flow/src/page/sta/StaEdit.jsx
+++ b/zy-acs-flow/src/page/sta/StaEdit.jsx
@@ -42,6 +42,12 @@
const StaEdit = () => {
const translate = useTranslate();
+ const greaterThanZero = useMemo(() => (value) => {
+ if (value === undefined || value === null || value === '') {
+ return undefined;
+ }
+ return Number(value) >= 0 ? undefined : translate('validate.gtZero');
+ }, [translate]);
return (
<Edit
@@ -127,20 +133,45 @@
<NumberInput
label="table.field.sta.capacity"
source="capacity"
- validate={required()}
+ validate={[required(), greaterThanZero]}
/>
<NumberInput
+ label="table.field.sta.angle"
+ source="angle"
+ validate={[required(), greaterThanZero]}
+ />
+ {/* <NumberInput
label="table.field.sta.offset"
source="offset"
validate={required()}
+ /> */}
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.sta.height"
+ source="height"
+ validate={[required(), greaterThanZero]}
+ />
+ <NumberInput
+ label="table.field.sta.depth"
+ source="depth"
+ helperText={translate('page.sta.depthHint')}
+ validate={[required(), greaterThanZero]}
/>
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
- label="table.field.sta.angle"
- source="angle"
- validate={required()}
+ label="table.field.sta.inboundWait"
+ source="inboundWait"
+ validate={greaterThanZero}
/>
+ <NumberInput
+ label="table.field.sta.outboundWait"
+ source="outboundWait"
+ validate={greaterThanZero}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
{/* <NumberInput
label="table.field.sta.occCnt"
source="occCnt"
@@ -152,14 +183,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>
--
Gitblit v1.9.1