From 176b6279180b4543eae6e0ff1422c885a139ef83 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 14:27:17 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 2
rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx | 24 ++++++------
rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx | 2
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 17 +++++---
rsf-admin/src/page/basicInfo/matnr/index.jsx | 0
rsf-admin/src/page/ResourceContent.js | 2
rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx | 6 +-
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 8 ++--
8 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index f2e8798..989d17e 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/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';
diff --git a/rsf-admin/src/page/matnr/MatnrCreate.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
similarity index 98%
rename from rsf-admin/src/page/matnr/MatnrCreate.jsx
rename to rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
index 0d7a4cc..7d92209 100644
--- a/rsf-admin/src/page/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/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;
diff --git a/rsf-admin/src/page/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
similarity index 97%
rename from rsf-admin/src/page/matnr/MatnrEdit.jsx
rename to rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index 237e49b..49e84ab 100644
--- a/rsf-admin/src/page/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/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();
diff --git a/rsf-admin/src/page/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
similarity index 93%
rename from rsf-admin/src/page/matnr/MatnrList.jsx
rename to rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 9c8e8f3..47c7b15 100644
--- a/rsf-admin/src/page/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/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" />
diff --git a/rsf-admin/src/page/matnr/MatnrListAside.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx
similarity index 90%
rename from rsf-admin/src/page/matnr/MatnrListAside.jsx
rename to rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx
index 8168b58..e9a9147 100644
--- a/rsf-admin/src/page/matnr/MatnrListAside.jsx
+++ b/rsf-admin/src/page/basicInfo/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');
+ });
diff --git a/rsf-admin/src/page/matnr/MatnrPanel.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/matnr/MatnrPanel.jsx
rename to rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx
index 9951914..ebf9a95 100644
--- a/rsf-admin/src/page/matnr/MatnrPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/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 = () => {
diff --git a/rsf-admin/src/page/matnr/index.jsx b/rsf-admin/src/page/basicInfo/matnr/index.jsx
similarity index 100%
rename from rsf-admin/src/page/matnr/index.jsx
rename to rsf-admin/src/page/basicInfo/matnr/index.jsx
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index 4d0887a..bde419b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/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);
--
Gitblit v1.9.1