fix:收货单选单字段

verou

2025-03-31 466689e5e7db6520d719fe0cf9aee7c4eda9d457

fix:收货单选单字段

 rsf-admin/src/i18n/en.js

@@ -134,6 +134,7 @@
        container: 'Container',
        contract: 'Contract',
        qlyInspect: 'QlyInspect',
        qlyIsptItem: '质检信息明细',
        dictType: 'DictType',
        dictData: 'DictData',
        companys: 'Companys',
@@ -409,6 +410,7 @@
                projectName: "ProjectName",
            },
            qlyInspect: {
                asnItemId: "asnItemId",
                code: "code",
                wkType: "wkType",
                safeQty: "safeQty",

 rsf-admin/src/i18n/zh.js

@@ -134,6 +134,7 @@
        container: '容器管理',
        contract: '合同信息',
        qlyInspect: '质检信息',
        qlyIsptItem: '质检信息明细',
        dictType: '数据字典',
        dictData: '字典数据集',
        companys: '往来企业',
@@ -417,26 +418,27 @@
                projectName: "项目名称",
            },
            qlyInspect: {
                asnItemId: "通知单明细ID",
                code: "编码",
                wkType: "wkType",
                wkType: "业务类型",
                safeQty: "合格数量",
                dlyQty: "dlyQty",
                rcptQty: "rcptQty",
                isptQty: "isptQty",
                dlyQty: "送货数量",
                rcptQty: "收货数量    ",
                isptQty: "质检数量",
            },
            qlyIsptItem: {
                ispectId: "ispectId",
                matnrCode: "matnrCode",
                maktx: "maktx",
                label: "label",
                splrName: "splrName",
                splrBatch: "splrBatch",
                stockBatch: "stockBatch",
                rcptQty: "rcptQty",
                dlyQty: "dlyQty",
                disQty: "disQty",
                safeQty: "safeQty",
                picPath: "picPath",
                ispectId: "主单ID",
                matnrCode: "编号",
                maktx: "物料名称",
                label: "标签",
                splrName: "供应商名称",
                splrBatch: "供应商批次",
                stockBatch: "库存批次",
                rcptQty: "收货数量",
                dlyQty: "送货数量",
                disQty: "不合数量",
                safeQty: "合格数量",
                picPath: "图片路径",
            },
            dictType: {
                code: "字典编码",

 rsf-admin/src/page/asnOrder/AsnOrderModal.jsx

@@ -256,37 +256,18 @@
    const [columns, setColumns] = useState([

        {
            field: 'matnrId',
            headerName: translate('table.field.asnOrderItem.matnrId'),
            minWidth: 100,
            flex: 1,
            editable: false,
        },
        {
            field: 'maktx',
            headerName: translate('table.field.asnOrderItem.maktx'),
            minWidth: 100,
            flex: 1,
            editable: true,
            editable: false,
        },
        {
            field: 'maktxCode',
            headerName: translate('table.field.asnOrderItem.maktxCode'),
            minWidth: 100,
            flex: 1,
            editable: true,
        },
        {
            field: 'poDetlId',
            headerName: translate('table.field.asnOrderItem.poDetlId'),
            minWidth: 100,
            flex: 1,
        },
        {
            field: 'poDetlCode',
            headerName: translate('table.field.asnOrderItem.poDetlCode'),
            minWidth: 100,
            flex: 1,
            editable: false,
        },
        {
            field: 'anfme',
@@ -294,27 +275,6 @@
            minWidth: 100,
            flex: 1,
            editable: true,
        },
        {
            field: 'stockUnit',
            headerName: translate('table.field.asnOrderItem.stockUnit'),
            minWidth: 100,
            flex: 1,
            editable: false,
        },
        // {
        //     field: 'purQty',
        //     headerName: translate('table.field.asnOrderItem.purQty'),
        //     minWidth: 100,
        //     flex: 1,
        //     editable: true,
        // },
        {
            field: 'purUnit',
            headerName: translate('table.field.asnOrderItem.purUnit'),
            minWidth: 100,
            flex: 1,
            editable: false,
        },
        {
            field: 'splrCode',
@@ -337,6 +297,41 @@
            flex: 1,
            editable: true,
        },
        {
            field: 'poDetlId',
            headerName: translate('table.field.asnOrderItem.poDetlId'),
            minWidth: 100,
            flex: 1,
        },
        {
            field: 'poDetlCode',
            headerName: translate('table.field.asnOrderItem.poDetlCode'),
            minWidth: 100,
            flex: 1,
        },

        {
            field: 'stockUnit',
            headerName: translate('table.field.asnOrderItem.stockUnit'),
            minWidth: 100,
            flex: 1,
            editable: false,
        },
        // {
        //     field: 'purQty',
        //     headerName: translate('table.field.asnOrderItem.purQty'),
        //     minWidth: 100,
        //     flex: 1,
        //     editable: true,
        // },
        {
            field: 'purUnit',
            headerName: translate('table.field.asnOrderItem.purUnit'),
            minWidth: 100,
            flex: 1,
            editable: false,
        },



    ])
@@ -378,7 +373,7 @@
                headerName: el.fieldsAlise,
                minWidth: 100,
                flex: 1,
                editable: true
                editable: false
            }))
            setColumns([...columns, ...cols, action])
        } else {
@@ -410,8 +405,6 @@
        setSelectedRows(ids)

    };



    return (
        <div style={{ height: 400, width: '100%' }}>

 rsf-admin/src/page/qlyInspect/QlyInspectCreate.jsx

@@ -85,11 +85,17 @@
                        <DialogContent sx={{ mt: 2 }}>
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.qlyInspect.asnItemId"
                                        source="asnItemId"
                                        autoFocus
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.qlyInspect.code"
                                        source="code"
                                        parse={v => v}
                                        autoFocus
                                        validate={required()}
                                    />
                                </Grid>

 rsf-admin/src/page/qlyInspect/QlyInspectEdit.jsx

@@ -64,11 +64,17 @@
                            {translate('common.edit.title.main')}
                        </Typography>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.qlyInspect.asnItemId"
                                source="asnItemId"
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.qlyInspect.code"
                                source="code"
                                parse={v => v}
                                autoFocus
                                validate={required()}
                            />
                        </Stack>

 rsf-admin/src/page/qlyInspect/QlyInspectList.jsx

@@ -60,9 +60,8 @@

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <NumberInput source="asnItemId" label="table.field.qlyInspect.asnItemId" />,
    <TextInput source="code" label="table.field.qlyInspect.code" />,
    <TextInput source="wkType" label="table.field.qlyInspect.wkType" />,
    <NumberInput source="safeQty" label="table.field.qlyInspect.safeQty" />,
@@ -106,7 +105,6 @@
                actions={(
                    <TopToolbar>
                        <FilterButton />
                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                        <SelectColumnsButton preferenceKey='qlyInspect' />
                        <MyExportButton />
                    </TopToolbar>
@@ -117,9 +115,12 @@
                    preferenceKey='qlyInspect'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    expand={() => <QlyInspectPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <NumberField source="asnItemId$" label="table.field.qlyInspect.asnItemId" />
                    <TextField source="code" label="table.field.qlyInspect.code" />
                    <TextField source="wkType" label="table.field.qlyInspect.wkType" />
                    <NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
@@ -138,7 +139,6 @@
                    <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">
                        <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                    </WrapperField>
                </StyledDatagrid>

 rsf-admin/src/page/qlyInspect/QlyInspectPanel.jsx

@@ -42,6 +42,12 @@
                    <Grid container spacing={2}>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.qlyInspect.asnItemId" 
                                property={record.asnItemId}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.qlyInspect.code" 
                                property={record.code}
                            />

 rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx

@@ -60,8 +60,6 @@

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <NumberInput source="ispectId" label="table.field.qlyIsptItem.ispectId" />,
    <TextInput source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />,