Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-03-27 4d0c90054372b6fa64e99ad4bbc5f302d2b9f725

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-admin/src/i18n/en.js

@@ -567,7 +567,7 @@
                device: "device",
                deviceCode: "deviceCode",
                deviceSite: "deviceSite",
                flagInitu: "flagInitu",
                flagInit: "flagInit",
                sites: "sites",
            },
            waitPakin: {

 rsf-admin/src/i18n/zh.js

@@ -573,7 +573,7 @@
                device: "设备类型",
                deviceCode: "设备编号",
                deviceSite: "设备站点",
                flagInitu: "是否初始化",
                flagInit: "是否初始化",
                sites: "作业站点",
            },
            waitPakin: {

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteCreate.jsx

@@ -91,6 +91,7 @@
                                        name="type"
                                        validate={[required()]}
                                        dictTypeCode="sys_task_type"
                                        multiple
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteEdit.jsx

@@ -70,6 +70,7 @@
                                name="type"
                                validate={[required()]}
                                dictTypeCode="sys_task_type"
                                multiple
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>

 rsf-admin/src/page/basicInfo/deviceSite/DeviceSiteList.jsx

@@ -45,6 +45,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import InitModal from "./InitModal";
import CabinIcon from '@mui/icons-material/Cabin';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
@@ -135,6 +136,7 @@
                actions={(
                    <TopToolbar>
                        <FilterButton />
                        <InitButton />
                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                        <SelectColumnsButton preferenceKey='deviceSite' />
                        <MyExportButton />
@@ -146,17 +148,15 @@
                    preferenceKey='deviceSite'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    expand={() => <DeviceSitePanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="name" label="table.field.deviceSite.name" />
                    <NumberField source="type" label="table.field.deviceSite.type" />
                    <NumberField source="type$" label="table.field.deviceSite.type" />
                    <TextField source="site" label="table.field.deviceSite.site" />
                    <TextField source="wcsCode" label="table.field.deviceSite.wcsCode" />
                    <TextField source="label" label="table.field.deviceSite.label" />
                    <TextField source="device" label="table.field.deviceSite.device" />
                    <TextField source="device$" label="table.field.deviceSite.device" />
                    <TextField source="deviceCode" label="table.field.deviceSite.deviceCode" />
                    <TextField source="deviceSite" label="table.field.deviceSite.deviceSite" />

@@ -196,3 +196,23 @@
}

export default DeviceSiteList;

const InitButton = () => {
    const record = useRecordContext();
    const notify = useNotify();

    const [createDialog, setCreateDialog] = useState(false);

    return (
        <>
            <Button onClick={() => setCreateDialog(true)} label={"toolbar.siteInit"}>
                <CabinIcon />
            </Button>
            <InitModal
                open={createDialog}
                setOpen={setCreateDialog}
            />
        </>

    )
}

 rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx

@@ -117,7 +117,6 @@
                                    label={translate("table.field.deviceSite.device")}
                                    name="deviceType"
                                    dictTypeCode="sys_device_type"
                                    multiple
                                />
                            </Grid>

@@ -151,8 +150,8 @@

                            <Grid item xs={4}>
                                <SelectInput
                                    label="table.field.deviceSite.flagInitu"
                                    source="flagInitu"
                                    label="table.field.deviceSite.flagInit"
                                    source="flagInit"
                                    choices={[
                                        { id: 0, name: '否' },
                                        { id: 1, name: '是' },