#修改 1. 物料分类选择显示问题修复

skyouc

2025-02-24 a4709a1df483a897aba358c3c52d1331997d8949

#修改
1. 物料分类选择显示问题修复

 rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx

@@ -347,7 +347,7 @@
                                    <Grid item xs={6} display="flex" gap={1}>
                                        <ReferenceInput
                                            source="rglarId"
                                            reference="rglarId"
                                            reference="batchRegular"
                                        >
                                            <AutocompleteInput
                                                label="table.field.matnr.rglarId"

 rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx

@@ -163,7 +163,7 @@
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="rglarId"
                                        reference="rglarId"
                                        reference="batchRegular"
                                        perPage={REFERENCE_INPUT_PAGESIZE}
                                    >
                                        <AutocompleteInput

 rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx

@@ -67,10 +67,10 @@

    <TextInput source="name" label="table.field.matnr.name" />,
    <TextInput source="code" label="table.field.matnr.code" />,
    <ReferenceInput source="shipperId" label="table.field.matnr.shipperId" reference="shipper">
    <ReferenceInput source="shipperId$" label="table.field.matnr.shipperId" reference="shipper">
        <AutocompleteInput label="table.field.matnr.shipperId" optionText="name" filterToQuery={(val) => ({ name: val })} />
    </ReferenceInput>,
    <ReferenceInput source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" >
    <ReferenceInput source="groupId$" label="table.field.matnr.groupId" reference="matnrGroup" >
        <AutocompleteInput label="table.field.matnr.groupId" optionText="code" filterToQuery={(val) => ({ code: val })} />
    </ReferenceInput>,
    <ReferenceInput source="rglarId" label="table.field.matnr.rglarId" reference="rglarId">
@@ -151,13 +151,13 @@
                <NumberField source="id" />
                <TextField source="name" label="table.field.matnr.name" />
                <TextField source="code" label="table.field.matnr.code" />
                <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
                <ReferenceField source="shipperId$" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
                    <TextField source="name" />
                </ReferenceField>
                <ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
                <ReferenceField source="groupId$" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
                    <TextField source="code" />
                </ReferenceField>
                <ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="rglarId" link={false} sortable={false}>
                <ReferenceField source="rglarId$" label="table.field.matnr.rglarId" reference="batchRegular" link={false} sortable={false}>
                    <TextField source="code" />
                </ReferenceField>
                <TextField source="erpCode" label="table.field.matnr.erpCode" />

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java

@@ -6,6 +6,7 @@
import java.util.Date;

import com.vincent.rsf.server.manager.service.BatchRegularService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.ShipperService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -327,10 +328,10 @@
//    );

    public String getShipperId$(){
        ShipperService service = SpringUtils.getBean(ShipperService.class);
        Shipper shipper = service.getById(this.shipperId);
        if (!Cools.isEmpty(shipper)){
            return String.valueOf(shipper.getName());
        CompanysService service = SpringUtils.getBean(CompanysService.class);
        Companys companys = service.getById(this.shipperId);
        if (!Cools.isEmpty(companys)){
            return String.valueOf(companys.getName());
        }
        return null;
    }
@@ -344,7 +345,7 @@
        return null;
    }

    public String getRglarId(){
    public String getRglarId$(){
        BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
        BatchRegular batchRegular = service.getById(this.rglarId);
        if (!Cools.isEmpty(batchRegular)){