#

whycq

2025-02-21 176b6279180b4543eae6e0ff1422c885a139ef83

#

 rsf-admin/src/page/ResourceContent.js

@@ -15,7 +15,7 @@
import operationRecord from './system/operationRecord';
import customer from './customer';
import shipper from './shipper';
import matnr from './matnr';
import matnr from './basicInfo/matnr';
import matnrGroup from './matnrGroup';
import warehouse from './warehouse';
import warehouseAreas from './warehouseAreas';

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

File was renamed from rsf-admin/src/page/matnr/MatnrCreate.jsx
@@ -27,9 +27,9 @@
    Grid,
    Box,
} from '@mui/material';
import DialogCloseButton from "../components/DialogCloseButton";
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
import DialogCloseButton from "@/page/components/DialogCloseButton";
import StatusSelectInput from "@/page/components/StatusSelectInput";
import MemoInput from "@/page/components/MemoInput";

const MatnrCreate = (props) => {
    const { open, setOpen } = props;

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

File was renamed from rsf-admin/src/page/matnr/MatnrEdit.jsx
@@ -24,10 +24,10 @@
import { Stack, Grid, Box, Typography } from '@mui/material';
import * as Common from '@/utils/common';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
import EditBaseAside from "../components/EditBaseAside";
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
import EditBaseAside from "@/page/components/EditBaseAside";
import CustomerTopToolBar from "@/page/components/EditTopToolBar";
import MemoInput from "@/page/components/MemoInput";
import StatusSelectInput from "@/page/components/StatusSelectInput";

const FormToolbar = () => {
    const { getValues } = useFormContext();

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

File was renamed from rsf-admin/src/page/matnr/MatnrList.jsx
@@ -36,14 +36,14 @@
import { styled } from '@mui/material/styles';
import MatnrCreate from "./MatnrCreate";
import MatnrPanel from "./MatnrPanel";
import EmptyData from "../components/EmptyData";
import MyCreateButton from "../components/MyCreateButton";
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
import EmptyData from "@/page/components/EmptyData";
import MyCreateButton from "@/page/components/MyCreateButton";
import MyExportButton from '@/page/components/MyExportButton';
import PageDrawer from "@/page/components/PageDrawer";
import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import ImportButton from "../components/ImportButton";
import ImportButton from "@/page/components/ImportButton";
import MatListAside from './MatnrListAside';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -143,7 +143,10 @@
                rowClick={(id, resource, record) => false}
                expand={() => <MatnrPanel />}
                expandSingle={true}
                omit={['id', 'createTime', 'createBy', 'memo']}
                omit={['id','shipperId','erpCode','spec','model','weight','color','size','describle'
                    ,'nromNum','unit','purchaseUnit','stockUnit','stockLeval','isLabelMange','safeQty'
                    ,'minQty','maxQty','stagn','valid','validWarn','flagCheck','updateTime', 'updateBy'
                    , 'createTime', 'createBy', 'memo']}
            >
                <NumberField source="id" />
                <TextField source="name" label="table.field.matnr.name" />

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

File was renamed from rsf-admin/src/page/matnr/MatnrListAside.jsx
@@ -29,18 +29,18 @@
    const [treeData, setTreeData] = useState([]);

    useEffect(() => {
        request.get('/matnrGroup/tree')
        .then(res => {
            console.log('Tree Data:', res);
            if (res?.data?.code === 200) {
                setTreeData(res.data.data);
            } else {
                notify(res.data);
            }
        })
        .catch(error => {
            notify('Error fetching tree data');
        });
        request.post('/matnrGroup/tree')
            .then(res => {
                console.log('Tree Data:', res);
                if (res?.data?.code === 200) {
                    setTreeData(res.data.data);
                } else {
                    notify(res.data.msg);
                }
            })
            .catch(error => {
                notify('Error fetching tree data');
            });
        
        
        

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

File was renamed from rsf-admin/src/page/matnr/MatnrPanel.jsx
@@ -4,7 +4,7 @@
    useTranslate,
    useRecordContext,
} from 'react-admin';
import PanelTypography from "../components/PanelTypography";
import PanelTypography from "@/page/components/PanelTypography";
import * as Common from '@/utils/common'

const MatnrPanel = () => {

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

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java

@@ -107,7 +107,7 @@

    @PreAuthorize("hasAuthority('manager:matnrGroup:list')")
    @PostMapping("/matnrGroup/tree")
    public R tree(@RequestBody Map<String, Object> map) {
    public R tree() {
        List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
        List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
        return R.ok().add(treeData);