From d093d9d2135352fd40bc333e01f67dbdd69f01fa Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 01 四月 2025 14:30:45 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/sta/StaEdit.jsx   |   75 ++++++++++---------------
 zy-acs-flow/src/page/sta/StaCreate.jsx |   49 +++++++++-------
 zy-acs-flow/src/page/sta/StaList.jsx   |   37 +++++-------
 version/db/jbly/20250401/dual.sql      |    3 +
 4 files changed, 75 insertions(+), 89 deletions(-)

diff --git a/version/db/jbly/20250401/dual.sql b/version/db/jbly/20250401/dual.sql
index 9f5468d..57842bf 100644
--- a/version/db/jbly/20250401/dual.sql
+++ b/version/db/jbly/20250401/dual.sql
@@ -8,5 +8,8 @@
 alter table man_sta
     add angle varchar(255) null comment '浣滀笟瑙掑害' after offset;
 
+alter table man_sta
+    modify sta_type bigint null comment '绔欑被鍨媅man_sta_type]';
+
 INSERT INTO man_action_type (id, uuid, name, status, deleted, tenant_id, create_by, create_time, update_by, update_time, memo) VALUES (26, 'ReadyTakeFromConveyorSta', '鍑嗗浠庤緭閫佺嚎鍙栬揣', 1, 0, null, 41, '2023-06-09 19:41:10', 41, '2023-06-09 19:41:10', null);
 INSERT INTO man_action_type (id, uuid, name, status, deleted, tenant_id, create_by, create_time, update_by, update_time, memo) VALUES (27, 'ReadyReleaseToConveyorSta', '鍑嗗寰�杈撻�佺嚎鏀捐揣', 1, 0, null, 41, '2023-06-09 19:41:10', 41, '2023-06-09 19:41:10', null);
diff --git a/zy-acs-flow/src/page/sta/StaCreate.jsx b/zy-acs-flow/src/page/sta/StaCreate.jsx
index 6343689..8cc6844 100644
--- a/zy-acs-flow/src/page/sta/StaCreate.jsx
+++ b/zy-acs-flow/src/page/sta/StaCreate.jsx
@@ -85,14 +85,6 @@
                         <DialogContent>
                             <Grid container rowSpacing={2} columnSpacing={2}>
                                 <Grid item xs={6} display="flex" gap={1}>
-                                    <TextInput
-                                        label="table.field.sta.uuid"
-                                        source="uuid"
-                                        parse={v => v}
-                                        autoFocus
-                                    />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
                                     <ReferenceInput
                                         source="zoneId"
                                         reference="zone"
@@ -101,24 +93,34 @@
                                             label="table.field.sta.zoneId"
                                             optionText="name"
                                             filterToQuery={(val) => ({ name: val })}
+                                            validate={required()}
                                         />
                                     </ReferenceInput>
                                 </Grid>
+                                {/* <Grid item xs={6} display="flex" gap={1}>
+                                    <TextInput
+                                        label="table.field.sta.uuid"
+                                        source="uuid"
+                                        parse={v => v}
+                                        autoFocus
+                                    />
+                                </Grid> */}
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.sta.staNo"
                                         source="staNo"
                                         parse={v => v}
+                                        validate={required()}
                                     />
                                 </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.sta.name"
                                         source="name"
                                         parse={v => v}
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
+                                </Grid> */}
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <ReferenceInput
                                         source="staType"
                                         reference="staType"
@@ -130,7 +132,7 @@
                                             validate={required()}
                                         />
                                     </ReferenceInput>
-                                </Grid>
+                                </Grid> */}
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <ReferenceInput
                                         source="code"
@@ -140,6 +142,7 @@
                                             label="table.field.sta.code"
                                             optionText="data"
                                             filterToQuery={(val) => ({ data: val })}
+                                            validate={required()}
                                         />
                                     </ReferenceInput>
                                 </Grid>
@@ -147,43 +150,44 @@
                                     <NumberInput
                                         label="table.field.sta.offset"
                                         source="offset"
+                                        validate={required()}
                                     />
                                 </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.sta.autoing"
                                         source="autoing"
                                         parse={v => v}
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
+                                </Grid> */}
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.sta.loading"
                                         source="loading"
                                         parse={v => v}
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
+                                </Grid> */}
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.sta.inEnable"
                                         source="inEnable"
                                         parse={v => v}
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
+                                </Grid> */}
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.sta.outEnable"
                                         source="outEnable"
                                         parse={v => v}
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
+                                </Grid> */}
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.sta.zpallet"
                                         source="zpallet"
                                         parse={v => v}
                                     />
-                                </Grid>
+                                </Grid> */}
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <ReferenceInput
                                         source="staSts"
@@ -193,6 +197,7 @@
                                             label="table.field.sta.staSts"
                                             optionText="name"
                                             filterToQuery={(val) => ({ name: val })}
+                                            validate={required()}
                                         />
                                     </ReferenceInput>
                                 </Grid>
diff --git a/zy-acs-flow/src/page/sta/StaEdit.jsx b/zy-acs-flow/src/page/sta/StaEdit.jsx
index c0667bf..b80a65c 100644
--- a/zy-acs-flow/src/page/sta/StaEdit.jsx
+++ b/zy-acs-flow/src/page/sta/StaEdit.jsx
@@ -63,14 +63,14 @@
                         <Typography variant="h6" gutterBottom>
                             {translate('common.edit.title.main')}
                         </Typography>
-                        <Stack direction='row' gap={2}>
+                        {/* <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.sta.uuid"
                                 source="uuid"
                                 parse={v => v}
                                 autoFocus
                             />
-                        </Stack>
+                        </Stack> */}
                         <Stack direction='row' gap={2}>
                             <ReferenceInput
                                 source="zoneId"
@@ -81,36 +81,24 @@
                                     label="table.field.sta.zoneId"
                                     optionText="name"
                                     filterToQuery={(val) => ({ name: val })}
+                                    validate={required()}
                                 />
                             </ReferenceInput>
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.sta.staNo"
                                 source="staNo"
                                 parse={v => v}
+                                validate={required()}
                             />
                         </Stack>
-                        <Stack direction='row' gap={2}>
+                        {/* <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.sta.name"
                                 source="name"
                                 parse={v => v}
                             />
-                        </Stack>
+                        </Stack> */}
                         <Stack direction='row' gap={2}>
-                            <ReferenceInput
-                                source="staType"
-                                reference="staType"
-                                perPage={REFERENCE_INPUT_PAGESIZE}
-                            >
-                                <AutocompleteInput
-                                    label="table.field.sta.staType"
-                                    optionText="name"
-                                    filterToQuery={(val) => ({ name: val })}
-                                    validate={required()}
-                                />
-                            </ReferenceInput>
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <ReferenceInput
@@ -122,13 +110,13 @@
                                     label="table.field.sta.code"
                                     optionText="data"
                                     filterToQuery={(val) => ({ data: val })}
+                                    validate={required()}
                                 />
                             </ReferenceInput>
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <NumberInput
                                 label="table.field.sta.offset"
                                 source="offset"
+                                validate={required()}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
@@ -137,8 +125,6 @@
                                 source="autoing"
                                 parse={v => v}
                             />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.sta.loading"
                                 source="loading"
@@ -151,40 +137,39 @@
                                 source="inEnable"
                                 parse={v => v}
                             />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.sta.outEnable"
                                 source="outEnable"
                                 parse={v => v}
                             />
                         </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.sta.zpallet"
-                                source="zpallet"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <ReferenceInput
-                                source="staSts"
-                                reference="staSts"
-                                perPage={REFERENCE_INPUT_PAGESIZE}
-                            >
-                                <AutocompleteInput
-                                    label="table.field.sta.staSts"
-                                    optionText="name"
-                                    filterToQuery={(val) => ({ name: val })}
-                                />
-                            </ReferenceInput>
-                        </Stack>
-
                     </Grid>
                     <Grid item xs={12} md={4}>
                         <Typography variant="h6" gutterBottom>
                             {translate('common.edit.title.common')}
                         </Typography>
+                        <ReferenceInput
+                            source="staSts"
+                            reference="staSts"
+                            perPage={REFERENCE_INPUT_PAGESIZE}
+                        >
+                            <AutocompleteInput
+                                label="table.field.sta.staSts"
+                                optionText="name"
+                                filterToQuery={(val) => ({ name: val })}
+                            />
+                        </ReferenceInput>
+                        <ReferenceInput
+                            source="staType"
+                            reference="staType"
+                            perPage={REFERENCE_INPUT_PAGESIZE}
+                        >
+                            <AutocompleteInput
+                                label="table.field.sta.staType"
+                                optionText="name"
+                                filterToQuery={(val) => ({ name: val })}
+                            />
+                        </ReferenceInput>
                         <StatusSelectInput />
                         <Box mt="2em" />
                         <MemoInput />
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index d400d0d..f45a507 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -58,29 +58,27 @@
 }));
 
 const filters = [
-    <SearchInput source="condition" alwaysOn />,
-    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
-    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
+    // <SearchInput source="condition" alwaysOn />,
+    <TextInput source="staNo" label="table.field.sta.staNo" alwaysOn resettable />,
+    // <DateInput label='common.time.after' source="timeStart" alwaysOn />,
+    // <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
     <TextInput source="uuid" label="table.field.sta.uuid" />,
     <ReferenceInput source="zoneId" label="table.field.sta.zoneId" reference="zone">
         <AutocompleteInput label="table.field.sta.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
     </ReferenceInput>,
-    <TextInput source="staNo" label="table.field.sta.staNo" />,
+    <ReferenceInput source="code" label="table.field.sta.code" reference="code" alwaysOn>
+        <AutocompleteInput label="table.field.sta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
+    </ReferenceInput>,
     <TextInput source="name" label="table.field.sta.name" />,
     <ReferenceInput source="staType" label="table.field.sta.staType" reference="staType">
         <AutocompleteInput label="table.field.sta.staType" optionText="name" filterToQuery={(val) => ({ name: val })} />
-    </ReferenceInput>,
-    <ReferenceInput source="code" label="table.field.sta.code" reference="code">
-        <AutocompleteInput label="table.field.sta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
     </ReferenceInput>,
     <NumberInput source="offset" label="table.field.sta.offset" />,
     <TextInput source="autoing" label="table.field.sta.autoing" />,
     <TextInput source="loading" label="table.field.sta.loading" />,
     <TextInput source="inEnable" label="table.field.sta.inEnable" />,
     <TextInput source="outEnable" label="table.field.sta.outEnable" />,
-    <TextInput source="zpallet" label="table.field.sta.zpallet" />,
-    <ReferenceInput source="staSts" label="table.field.sta.staSts" reference="staSts">
+    <ReferenceInput source="staSts" label="table.field.sta.staSts" reference="staSts" alwaysOn>
         <AutocompleteInput label="table.field.sta.staSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
     </ReferenceInput>,
 
@@ -132,7 +130,7 @@
                     rowClick={(id, resource, record) => false}
                     expand={() => <StaPanel />}
                     expandSingle={true}
-                    omit={['id', 'uuid', 'offset', 'updateBy', 'createTime', 'createBy', 'memo']}
+                    omit={['id', 'uuid', 'name', 'zpallet', 'updateBy', 'createTime', 'createBy', 'statusBool', 'memo']}
                 >
                     <NumberField source="id" />
                     <TextField source="uuid" label="table.field.sta.uuid" />
@@ -140,31 +138,26 @@
                     <ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
                         <TextField source="name" />
                     </ReferenceField>
-                    <TextField source="name" label="table.field.sta.name" />
-                    <ReferenceField source="staType" label="table.field.sta.staType" reference="staType" link={false} sortable={false}>
-                        <TextField source="name" />
-                    </ReferenceField>
                     <ReferenceField source="code" label="table.field.sta.code" reference="code" link={false} sortable={false}>
                         <TextField source="data" />
                     </ReferenceField>
+                    <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
+                        <TextField source="name" />
+                    </ReferenceField>
+                    <TextField source="name" label="table.field.sta.name" />
                     <NumberField source="offset" label="table.field.sta.offset" />
                     <TextField source="autoing" label="table.field.sta.autoing" />
                     <TextField source="loading" label="table.field.sta.loading" />
                     <TextField source="inEnable" label="table.field.sta.inEnable" />
                     <TextField source="outEnable" label="table.field.sta.outEnable" />
                     <TextField source="zpallet" label="table.field.sta.zpallet" />
-                    <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
-                        <TextField source="name" />
-                    </ReferenceField>
-
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />
                     </ReferenceField>
                     <DateField source="updateTime" label="common.field.updateTime" showTime />
-                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
-                        <TextField source="nickname" />
+                    <ReferenceField source="staType" label="table.field.sta.staType" reference="staType" link={false} sortable={false}>
+                        <TextField source="name" />
                     </ReferenceField>
-                    <DateField source="createTime" label="common.field.createTime" showTime />
                     <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                     <TextField source="memo" label="common.field.memo" sortable={false} />
                     <WrapperField cellClassName="opt" label="common.field.opt">

--
Gitblit v1.9.1