#

luxiaotao1123

2024-09-26 47bb33460bd661b5f26a6add762f99aacbaf6cc3

#

 zy-acs-flow/src/i18n/en.js

@@ -64,7 +64,7 @@
            },
            loadMore: 'Load More Data',
            complete: 'Complete',
            deprecated: 'Deprecated',
            deprecate: 'Deprecate',
        },
        msg: {
            confirm: {

 zy-acs-flow/src/i18n/zh.js

@@ -64,7 +64,7 @@
            },
            loadMore: '加载更多',
            complete: '完成',
            deprecated: '废弃',
            deprecate: '废弃',
        },
        msg: {
            confirm: {
@@ -575,7 +575,7 @@
        jam: {
            enums: {
                state: {
                    running: '正在运行',
                    running: '处理中',
                    finish: '已完成',
                    fail: '失败',
                    deprecated: '废弃',

 zy-acs-flow/src/page/jam/JamList.jsx

@@ -123,8 +123,8 @@
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);

    const onDeprecated = (jamId) => {
        request.get("/jam/deprecated/" + jamId).then(res => {
    const onDeprecate = (jamId) => {
        request.get("/jam/deprecate/" + jamId).then(res => {
            const { code, msg, data } = res.data;
            if (code === 200) {
                notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
@@ -163,7 +163,7 @@
                perPage={DEFAULT_PAGE_SIZE}
                filterDefaultValues={{ state: 'RUNNING' }}
            >
                <TabbedDatagrid onDeprecated={onDeprecated} />
                <TabbedDatagrid onDeprecate={onDeprecate} />
            </List>
            <JamCreate
                open={createDialog}
@@ -186,7 +186,7 @@
    { id: 'DEPRECATED', name: 'page.jam.enums.state.deprecated' },
];

const TabbedDatagrid = ({ onDeprecated }) => {
const TabbedDatagrid = ({ onDeprecate }) => {
    const translate = useTranslate();
    const { filterValues, setFilters, displayedFilters } = useListContext();
    const isXSmall = useMediaQuery(theme =>
@@ -255,24 +255,24 @@
                                    <NumberField source="id" />
                                    <TextField source="uuid" label="table.field.jam.uuid" />
                                    {/* <TextField source="name" label="table.field.jam.name" /> */}
                                    <ReferenceField source="jamSeg" label="table.field.jam.jamSeg" reference="segment" link={false} sortable={false}>
                                        <FunctionField render={(record) => {
                                            return <>{record.groupId} - ({record.serial})</>
                                        }} />
                                    </ReferenceField>
                                    <ReferenceField source="jamAgv" label="table.field.jam.jamAgv" reference="agv" link={false} sortable={false} >
                                        <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
                                    </ReferenceField>
                                    <ReferenceField source="jamSeg" label="table.field.jam.jamSeg" reference="segment" link={false} sortable={false}>
                                        <FunctionField render={(record) => {
                                            return <>{record.groupId}&nbsp;({record.serial})</>
                                        }} />
                                    </ReferenceField>
                                    <ReferenceField source="jamCode" label="table.field.jam.jamCode" reference="code" link={false} sortable={false}>
                                        <TextField source="data" />
                                    </ReferenceField>
                                    <ReferenceField source="avoSeg" label="table.field.jam.avoSeg" reference="segment" link={false} sortable={false}>
                                        <FunctionField render={(record) => {
                                            return <>{record.groupId} - ({record.serial})</>
                                        }} />
                                    </ReferenceField>
                                    <ReferenceField source="avoAgv" label="table.field.jam.avoAgv" reference="agv" link={false} sortable={false}>
                                        <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
                                    </ReferenceField>
                                    <ReferenceField source="avoSeg" label="table.field.jam.avoSeg" reference="segment" link={false} sortable={false}>
                                        <FunctionField render={(record) => {
                                            return <>{record.groupId}&nbsp;({record.serial})</>
                                        }} />
                                    </ReferenceField>
                                    <ReferenceField source="avoCode" label="table.field.jam.avoCode" reference="code" link={false} sortable={false}>
                                        <TextField source="data" />
@@ -281,10 +281,18 @@
                                    <ReferenceField source="cycleCode" label="table.field.jam.cycleCode" reference="code" link={false} sortable={false}>
                                        <TextField source="data" />
                                    </ReferenceField>
                                    <FunctionField label="table.field.jam.duration" cellClassName="duration" render={record => (
                                        <>
                                            {((record.duration > 6000))
                                                ? <span style={{ color: 'red', fontWeight: 'bold' }}>{record.duration}</span>
                                                : <span>{record.duration || "-"}</span>
                                            }
                                            &nbsp;ms
                                        </>
                                    )} />
                                    <DateField source="startTime" label="table.field.jam.startTime" showTime />
                                    <DateField source="notifyTime" label="table.field.jam.notifyTime" showTime />
                                    <DateField source="endTime" label="table.field.jam.endTime" showTime />
                                    <NumberField source="duration" label="table.field.jam.duration" />
                                    <FunctionField label="table.field.segment.state" cellClassName="state" render={record => (
                                        <>
                                            {translate(states.find(item => item.id === record.state)?.name)}
@@ -304,7 +312,7 @@
                                        (record.state === "RUNNING") && (
                                            <>
                                                <ConfirmButton
                                                    label="common.action.deprecated"
                                                    label="common.action.deprecate"
                                                    size="small"
                                                    color="primary"
                                                    startIcon={<CloseIcon />}
@@ -317,7 +325,7 @@
                                                    }}
                                                    data={record.uuid}
                                                    onConfirm={() => {
                                                        onDeprecated(record.id);
                                                        onDeprecate(record.id);
                                                    }}
                                                />
                                            </>

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/JamController.java

@@ -108,4 +108,11 @@
        ExcelUtil.build(ExcelUtil.create(jamService.list(), Jam.class), response);
    }

    @PreAuthorize("hasAuthority('manager:jam:update')")
    @OperationLog("Deprecate Task")
    @GetMapping("/jam/deprecate/{id}")
    public R deprecate(@PathVariable Long id) {
        return jamService.deprecate(id, getLoginUserId()) ? R.ok("Deprecate Success") : R.error("Deprecate Fail");
    }

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/TaskController.java

@@ -130,5 +130,4 @@
        return taskService.cancel(id, getLoginUserId()) ? R.ok("Cancel Success") : R.error("Cancel Fail");
    }


}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/JamService.java

@@ -9,4 +9,5 @@

    Boolean checkIfFinish(Long avoAgv, String currCodeData);

    boolean deprecate(Long id, Long loginUserId);
}

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

@@ -60,4 +60,9 @@
        return null;
    }

    @Override
    public boolean deprecate(Long id, Long loginUserId) {
        return false;
    }

}