#

luxiaotao1123

2024-10-29 b38dda81d26f119dd5d7c53ab07a792751da4a56

#

 zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx

@@ -97,7 +97,7 @@
                                        />
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="agvId"
                                        reference="agv"
@@ -108,7 +108,7 @@
                                            filterToQuery={(val) => ({ uuid: val })}
                                        />
                                    </ReferenceInput>
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.funcSta.name"
@@ -153,7 +153,7 @@
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        source="state"
                                        label="table.field.funcSta.state"
@@ -163,7 +163,7 @@
                                        ]}
                                        parse={v => v}
                                    />
                                </Grid>
                                </Grid> */}
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <StatusSelectInput />
                                </Grid> */}

 zy-acs-flow/src/page/funcSta/FuncStaEdit.jsx

@@ -75,7 +75,7 @@
                                    filterToQuery={(val) => ({ name: val })}
                                />
                            </ReferenceInput>
                            <ReferenceInput
                            {/* <ReferenceInput
                                source="agvId"
                                reference="agv"
                                perPage={REFERENCE_INPUT_PAGESIZE}
@@ -85,7 +85,7 @@
                                    optionText="uuid"
                                    filterToQuery={(val) => ({ uuid: val })}
                                />
                            </ReferenceInput>
                            </ReferenceInput> */}
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
@@ -127,7 +127,7 @@
                                source="angle"
                                parse={v => v}
                            />
                            <SelectInput
                            {/* <SelectInput
                                source="state"
                                label="table.field.funcSta.state"
                                choices={[
@@ -135,7 +135,7 @@
                                    { id: 'OCCUPIED', name: 'page.funcSta.enums.state.occupied' },
                                ]}
                                parse={v => v}
                            />
                            /> */}
                        </Stack>
                    </Grid>
                    <Grid item xs={12} md={4}>

 zy-acs-flow/src/page/funcSta/FuncStaList.jsx

@@ -77,9 +77,9 @@
    <ReferenceInput source="zoneId" label="table.field.funcSta.zoneId" reference="zone">
        <AutocompleteInput label="table.field.funcSta.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
    </ReferenceInput>,
    <ReferenceInput source="agvId" label="table.field.funcSta.agvId" reference="agv" alwaysOn>
        <AutocompleteInput label="table.field.funcSta.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
    </ReferenceInput>,
    // <ReferenceInput source="agvId" label="table.field.funcSta.agvId" reference="agv" alwaysOn>
    //     <AutocompleteInput label="table.field.funcSta.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
    // </ReferenceInput>,
    <TextInput source="name" label="table.field.funcSta.name" />,
    <SelectInput
        source="type"
@@ -161,9 +161,9 @@
                    </ReferenceField>
                    <TextField source="name" label="table.field.funcSta.name" />
                    <TextField source="uuid" label="table.field.funcSta.uuid" />
                    <ReferenceField source="agvId" label="table.field.funcSta.agvId" reference="agv" link={false} sortable={false}>
                    {/* <ReferenceField source="agvId" label="table.field.funcSta.agvId" reference="agv" link={false} sortable={false}>
                        <TextField source="uuid" />
                    </ReferenceField>
                    </ReferenceField> */}
                    <FunctionField source="type" label="table.field.funcSta.type" render={record => translate(typeMap[record.type]) || record.type} />
                    <FunctionField source="state" label="table.field.funcSta.state" render={record => translate(stateMap[record.state]) || record.state} />
                    <ReferenceField source="code" label="table.field.funcSta.code" reference="code" link={false} sortable={false}>

 zy-acs-flow/src/page/funcSta/FuncStaPanel.jsx

@@ -52,12 +52,12 @@
                                property={record.zoneId$}
                            />
                        </Grid>
                        <Grid item xs={6}>
                        {/* <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.funcSta.agvId" 
                                property={record.agvId$}
                            />
                        </Grid>
                        </Grid> */}
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.funcSta.name" 
@@ -82,12 +82,12 @@
                                property={record.angle}
                            />
                        </Grid>
                        <Grid item xs={6}>
                        {/* <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.funcSta.state" 
                                property={record.state$}
                            />
                        </Grid>
                        </Grid> */}

                    </Grid>
                </CardContent>

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/FuncStaServiceImpl.java

@@ -57,19 +57,7 @@
    public List<FuncSta> findInIdleStatus(FuncStaType type, Long agvId) {
        LambdaQueryWrapper<FuncSta> wrapper = new LambdaQueryWrapper<FuncSta>()
                .eq(FuncSta::getType, type).eq(FuncSta::getStatus, StatusType.ENABLE.val);
        if (null != agvId) {
            wrapper.eq(FuncSta::getAgvId, agvId);
        }
        List<FuncSta> funcStaList = this.list(wrapper);
        funcStaList = funcStaList.stream().filter(funcSta -> {
            if (null != funcSta.getAgvId()) {
                if (!funcSta.getAgvId().equals(agvId)) {
                    return false;
                }
            }

            return true;
        }).collect(Collectors.toList());

        if (Cools.isEmpty(funcStaList)) {
            return new ArrayList<>();