From 666edb2c889556d3d963c341241cf43fafd32434 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 06 三月 2025 12:33:56 +0800
Subject: [PATCH] #优化 1. 路由层级修改
---
rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx | 8 +-
rsf-admin/src/page/system/serialRule/SerialRulePanel.jsx | 2
rsf-admin/src/page/system/dicts/dictType/DictTypeEdit.jsx | 8 +-
rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java | 40 ++++++++++
rsf-admin/src/page/system/serialRule/index.jsx | 0
rsf-admin/src/page/basicInfo/loc/LocCreate.jsx | 6
rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx | 6
rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx | 8 +-
rsf-admin/src/page/system/dicts/dictData/DictDataCreate.jsx | 6
rsf-server/src/main/resources/application-dev.yml | 8 +
rsf-admin/src/page/system/serialRuleItem/SerialRuleItemCreate.jsx | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 9 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java | 6
rsf-admin/src/page/system/serialRule/SerialRuleList.jsx | 10 +-
rsf-admin/src/page/basicInfo/loc/index.jsx | 0
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java | 6 -
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java | 8 ++
rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx | 6
rsf-admin/src/page/system/serialRuleItem/index.jsx | 0
rsf-admin/src/page/system/serialRuleItem/SerialRuleItemEdit.jsx | 8 +-
rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx | 12 +-
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 10 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java | 5 +
rsf-admin/src/page/system/dicts/dictData/DictDataPanel.jsx | 2
rsf-admin/src/page/system/dicts/dictType/DictTypePanel.jsx | 2
rsf-admin/src/page/system/dicts/dictData/index.jsx | 0
rsf-admin/src/page/system/dicts/dictType/index.jsx | 0
rsf-server/src/main/resources/application-prod.yml | 5 +
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java | 2
rsf-admin/src/page/basicInfo/loc/LocEdit.jsx | 8 +-
rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx | 10 +-
rsf-admin/src/page/system/serialRuleItem/SerialRuleItemPanel.jsx | 2
rsf-admin/src/page/basicInfo/loc/LocPanel.jsx | 2
rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx | 10 +-
34 files changed, 145 insertions(+), 76 deletions(-)
diff --git a/rsf-admin/src/page/loc/LocCreate.jsx b/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
similarity index 97%
rename from rsf-admin/src/page/loc/LocCreate.jsx
rename to rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
index 472ecfd..831412b 100644
--- a/rsf-admin/src/page/loc/LocCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocCreate.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 "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const LocCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/loc/LocEdit.jsx b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
similarity index 97%
rename from rsf-admin/src/page/loc/LocEdit.jsx
rename to rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
index 2b04603..c8c7fcb 100644
--- a/rsf-admin/src/page/loc/LocEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocEdit.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 "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import MemoInput from "../../components/MemoInput";
+import StatusSelectInput from "../../components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
similarity index 96%
rename from rsf-admin/src/page/loc/LocList.jsx
rename to rsf-admin/src/page/basicInfo/loc/LocList.jsx
index 1392d7d..1980da5 100644
--- a/rsf-admin/src/page/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -36,11 +36,11 @@
import { styled } from '@mui/material/styles';
import LocCreate from "./LocCreate";
import LocPanel from "./LocPanel";
-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 "../../components/EmptyData";
+import MyCreateButton from "../../components/MyCreateButton";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
+import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
diff --git a/rsf-admin/src/page/loc/LocPanel.jsx b/rsf-admin/src/page/basicInfo/loc/LocPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/loc/LocPanel.jsx
rename to rsf-admin/src/page/basicInfo/loc/LocPanel.jsx
index 2a429ec..323cfb7 100644
--- a/rsf-admin/src/page/loc/LocPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../components/PanelTypography";
import * as Common from '@/utils/common'
const LocPanel = () => {
diff --git a/rsf-admin/src/page/loc/index.jsx b/rsf-admin/src/page/basicInfo/loc/index.jsx
similarity index 100%
rename from rsf-admin/src/page/loc/index.jsx
rename to rsf-admin/src/page/basicInfo/loc/index.jsx
diff --git a/rsf-admin/src/page/dictData/DictDataCreate.jsx b/rsf-admin/src/page/system/dicts/dictData/DictDataCreate.jsx
similarity index 96%
rename from rsf-admin/src/page/dictData/DictDataCreate.jsx
rename to rsf-admin/src/page/system/dicts/dictData/DictDataCreate.jsx
index 2c609cc..cc98111 100644
--- a/rsf-admin/src/page/dictData/DictDataCreate.jsx
+++ b/rsf-admin/src/page/system/dicts/dictData/DictDataCreate.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 "../../../components/DialogCloseButton";
+import StatusSelectInput from "../../../components/StatusSelectInput";
+import MemoInput from "../../../components/MemoInput";
const DictDataCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/dictData/DictDataEdit.jsx b/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
similarity index 94%
rename from rsf-admin/src/page/dictData/DictDataEdit.jsx
rename to rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx
index 6eed851..6190953 100644
--- a/rsf-admin/src/page/dictData/DictDataEdit.jsx
+++ b/rsf-admin/src/page/system/dicts/dictData/DictDataEdit.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 "../../../components/EditBaseAside";
+import CustomerTopToolBar from "../../../components/EditTopToolBar";
+import MemoInput from "../../../components/MemoInput";
+import StatusSelectInput from "../../../components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/dictData/DictDataList.jsx b/rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx
similarity index 94%
rename from rsf-admin/src/page/dictData/DictDataList.jsx
rename to rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx
index 0770711..65ea973 100644
--- a/rsf-admin/src/page/dictData/DictDataList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx
@@ -36,14 +36,14 @@
import { styled } from '@mui/material/styles';
import DictDataCreate from "./DictDataCreate";
import DictDataPanel from "./DictDataPanel";
-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 "../../../components/EmptyData";
+import MyCreateButton from "../../../components/MyCreateButton";
+import MyExportButton from '../../../components/MyExportButton';
+import PageDrawer from "../../../components/PageDrawer";
+import MyField from "../../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
-import CustomerTopToolBar from "../components/EditTopToolBar";
+import CustomerTopToolBar from "../../../components/EditTopToolBar";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
diff --git a/rsf-admin/src/page/dictData/DictDataPanel.jsx b/rsf-admin/src/page/system/dicts/dictData/DictDataPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/dictData/DictDataPanel.jsx
rename to rsf-admin/src/page/system/dicts/dictData/DictDataPanel.jsx
index 557a79c..1f38976 100644
--- a/rsf-admin/src/page/dictData/DictDataPanel.jsx
+++ b/rsf-admin/src/page/system/dicts/dictData/DictDataPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../../components/PanelTypography";
import * as Common from '@/utils/common'
const DictDataPanel = () => {
diff --git a/rsf-admin/src/page/dictData/index.jsx b/rsf-admin/src/page/system/dicts/dictData/index.jsx
similarity index 100%
rename from rsf-admin/src/page/dictData/index.jsx
rename to rsf-admin/src/page/system/dicts/dictData/index.jsx
diff --git a/rsf-admin/src/page/dictType/DictTypeCreate.jsx b/rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx
similarity index 95%
rename from rsf-admin/src/page/dictType/DictTypeCreate.jsx
rename to rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx
index d652cba..9c17b03 100644
--- a/rsf-admin/src/page/dictType/DictTypeCreate.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.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 "../../../components/DialogCloseButton";
+import StatusSelectInput from "../../../components/StatusSelectInput";
+import MemoInput from "../../../components/MemoInput";
const DictTypeCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/dictType/DictTypeEdit.jsx b/rsf-admin/src/page/system/dicts/dictType/DictTypeEdit.jsx
similarity index 92%
rename from rsf-admin/src/page/dictType/DictTypeEdit.jsx
rename to rsf-admin/src/page/system/dicts/dictType/DictTypeEdit.jsx
index 96ace70..6155c7b 100644
--- a/rsf-admin/src/page/dictType/DictTypeEdit.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictTypeEdit.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 "../../../components/EditBaseAside";
+import CustomerTopToolBar from "../../../components/EditTopToolBar";
+import MemoInput from "../../../components/MemoInput";
+import StatusSelectInput from "../../../components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/dictType/DictTypeList.jsx b/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
similarity index 94%
rename from rsf-admin/src/page/dictType/DictTypeList.jsx
rename to rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
index dc30eae..4fc1553 100644
--- a/rsf-admin/src/page/dictType/DictTypeList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
@@ -36,11 +36,11 @@
import { styled } from '@mui/material/styles';
import DictTypeCreate from "./DictTypeCreate";
import DictTypePanel from "./DictTypePanel";
-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 "../../../components/EmptyData";
+import MyCreateButton from "../../../components/MyCreateButton";
+import MyExportButton from '../../../components/MyExportButton';
+import PageDrawer from "../../../components/PageDrawer";
+import MyField from "../../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
diff --git a/rsf-admin/src/page/dictType/DictTypePanel.jsx b/rsf-admin/src/page/system/dicts/dictType/DictTypePanel.jsx
similarity index 97%
rename from rsf-admin/src/page/dictType/DictTypePanel.jsx
rename to rsf-admin/src/page/system/dicts/dictType/DictTypePanel.jsx
index 3c6e787..88fa553 100644
--- a/rsf-admin/src/page/dictType/DictTypePanel.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictTypePanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../../components/PanelTypography";
import * as Common from '@/utils/common'
const DictTypePanel = () => {
diff --git a/rsf-admin/src/page/dictType/index.jsx b/rsf-admin/src/page/system/dicts/dictType/index.jsx
similarity index 100%
rename from rsf-admin/src/page/dictType/index.jsx
rename to rsf-admin/src/page/system/dicts/dictType/index.jsx
diff --git a/rsf-admin/src/page/serialRule/SerialRuleCreate.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
similarity index 96%
rename from rsf-admin/src/page/serialRule/SerialRuleCreate.jsx
rename to rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
index 4bbdfbe..7e5d392 100644
--- a/rsf-admin/src/page/serialRule/SerialRuleCreate.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleCreate.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 "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const SerialRuleCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/serialRule/SerialRuleEdit.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
similarity index 94%
rename from rsf-admin/src/page/serialRule/SerialRuleEdit.jsx
rename to rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx
index 2b03b81..4440c43 100644
--- a/rsf-admin/src/page/serialRule/SerialRuleEdit.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleEdit.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 "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import MemoInput from "../../components/MemoInput";
+import StatusSelectInput from "../../components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/serialRule/SerialRuleList.jsx b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
similarity index 95%
rename from rsf-admin/src/page/serialRule/SerialRuleList.jsx
rename to rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
index ffd2505..6cfa15c 100644
--- a/rsf-admin/src/page/serialRule/SerialRuleList.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRuleList.jsx
@@ -36,11 +36,11 @@
import { styled } from '@mui/material/styles';
import SerialRuleCreate from "./SerialRuleCreate";
import SerialRulePanel from "./SerialRulePanel";
-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 "../../components/EmptyData";
+import MyCreateButton from "../../components/MyCreateButton";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
+import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
diff --git a/rsf-admin/src/page/serialRule/SerialRulePanel.jsx b/rsf-admin/src/page/system/serialRule/SerialRulePanel.jsx
similarity index 98%
rename from rsf-admin/src/page/serialRule/SerialRulePanel.jsx
rename to rsf-admin/src/page/system/serialRule/SerialRulePanel.jsx
index e3a0a7f..8349792 100644
--- a/rsf-admin/src/page/serialRule/SerialRulePanel.jsx
+++ b/rsf-admin/src/page/system/serialRule/SerialRulePanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../components/PanelTypography";
import * as Common from '@/utils/common'
const SerialRulePanel = () => {
diff --git a/rsf-admin/src/page/serialRule/index.jsx b/rsf-admin/src/page/system/serialRule/index.jsx
similarity index 100%
rename from rsf-admin/src/page/serialRule/index.jsx
rename to rsf-admin/src/page/system/serialRule/index.jsx
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemCreate.jsx b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemCreate.jsx
similarity index 96%
rename from rsf-admin/src/page/serialRuleItem/SerialRuleItemCreate.jsx
rename to rsf-admin/src/page/system/serialRuleItem/SerialRuleItemCreate.jsx
index 18f73aa..f51326e 100644
--- a/rsf-admin/src/page/serialRuleItem/SerialRuleItemCreate.jsx
+++ b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemCreate.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 "../../components/DialogCloseButton";
+import StatusSelectInput from "../../components/StatusSelectInput";
+import MemoInput from "../../components/MemoInput";
const SerialRuleItemCreate = (props) => {
const { open, setOpen } = props;
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemEdit.jsx b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemEdit.jsx
similarity index 94%
rename from rsf-admin/src/page/serialRuleItem/SerialRuleItemEdit.jsx
rename to rsf-admin/src/page/system/serialRuleItem/SerialRuleItemEdit.jsx
index edec115..ecd5ba0 100644
--- a/rsf-admin/src/page/serialRuleItem/SerialRuleItemEdit.jsx
+++ b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemEdit.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 "../../components/EditBaseAside";
+import CustomerTopToolBar from "../../components/EditTopToolBar";
+import MemoInput from "../../components/MemoInput";
+import StatusSelectInput from "../../components/StatusSelectInput";
const FormToolbar = () => {
const { getValues } = useFormContext();
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemList.jsx b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx
similarity index 95%
rename from rsf-admin/src/page/serialRuleItem/SerialRuleItemList.jsx
rename to rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx
index 53aee0c..2f2fc62 100644
--- a/rsf-admin/src/page/serialRuleItem/SerialRuleItemList.jsx
+++ b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx
@@ -36,11 +36,11 @@
import { styled } from '@mui/material/styles';
import SerialRuleItemCreate from "./SerialRuleItemCreate";
import SerialRuleItemPanel from "./SerialRuleItemPanel";
-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 "../../components/EmptyData";
+import MyCreateButton from "../../components/MyCreateButton";
+import MyExportButton from '../../components/MyExportButton';
+import PageDrawer from "../../components/PageDrawer";
+import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
diff --git a/rsf-admin/src/page/serialRuleItem/SerialRuleItemPanel.jsx b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemPanel.jsx
similarity index 98%
rename from rsf-admin/src/page/serialRuleItem/SerialRuleItemPanel.jsx
rename to rsf-admin/src/page/system/serialRuleItem/SerialRuleItemPanel.jsx
index 6561de2..47d94ce 100644
--- a/rsf-admin/src/page/serialRuleItem/SerialRuleItemPanel.jsx
+++ b/rsf-admin/src/page/system/serialRuleItem/SerialRuleItemPanel.jsx
@@ -4,7 +4,7 @@
useTranslate,
useRecordContext,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
+import PanelTypography from "../../components/PanelTypography";
import * as Common from '@/utils/common'
const SerialRuleItemPanel = () => {
diff --git a/rsf-admin/src/page/serialRuleItem/index.jsx b/rsf-admin/src/page/system/serialRuleItem/index.jsx
similarity index 100%
rename from rsf-admin/src/page/serialRuleItem/index.jsx
rename to rsf-admin/src/page/system/serialRuleItem/index.jsx
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
index b60f6e1..212ea4e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
@@ -1,8 +1,6 @@
package com.vincent.rsf.server.api.service.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.OrderItem;
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.manager.entity.PurchaseItem;
import com.vincent.rsf.server.manager.service.PurchaseItemService;
@@ -27,8 +25,8 @@
* @description
* @create 2025/3/4 16:27
*/
-@Service
-public class ErpApiServiceImpl extends ServiceImpl implements ErpApiService {
+@Service("erpApiService")
+public class ErpApiServiceImpl implements ErpApiService {
@Autowired
private PurchaseService purchaseService;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java
new file mode 100644
index 0000000..292f461
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java
@@ -0,0 +1,40 @@
+package com.vincent.rsf.server.common.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Ryan
+ * @version 1.0
+ * @title SysStockFlowProperties
+ * @description
+ * @create 2025/3/5 17:02
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "stock")
+public class SysStockFlowProperties {
+
+
+
+
+
+ @Data
+ @Configuration
+ @ConfigurationProperties(prefix = "stock.inspect")
+ public class InspectProperties {
+ /**
+ * 鏄惁寮�鍚笂鏋舵牎楠�
+ */
+ private Boolean flagAvailable;
+
+ /**
+ * 鏄惁寮�鍚敹璐ф牎楠岋紝 涓婃灦鏍￠獙鍜屾敹璐ф牎楠岋紝鍙細寮�鍚竴涓�
+ */
+ private Boolean flagReceiving;
+
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index e088b8a..7343d00 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +21,7 @@
import java.util.*;
@RestController
+@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
public class AsnOrderController extends BaseController {
@Autowired
@@ -107,6 +109,13 @@
ExcelUtil.build(ExcelUtil.create(asnOrderService.list(), AsnOrder.class), response);
}
+ @PostMapping("/asnOrder/inspect")
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ public R inspect(@RequestBody List<AsnOrder> orders) {
+
+
+ return R.ok();
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
index b59e788..732ecdc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
@@ -59,7 +59,7 @@
* 鍗曟嵁鏉ユ簮
*/
@ApiModelProperty(value= "鍗曟嵁鏉ユ簮")
- private String from;
+ private String source;
/**
* 棰勮鍒拌揪鏃堕棿
@@ -171,10 +171,10 @@
public Purchase() {}
- public Purchase(String code,String type,String from,Date preArr,Double anfme,Double qty,Double workQty,String channel,String erpCode,Date startTime,Date endTime,String project,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Purchase(String code,String type,String source,Date preArr,Double anfme,Double qty,Double workQty,String channel,String erpCode,Date startTime,Date endTime,String project,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.code = code;
this.type = type;
- this.from = from;
+ this.source = source;
this.preArr = preArr;
this.anfme = anfme;
this.qty = qty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java
index aceb1c9..1513cd5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/ScheduleJobs.java
@@ -5,6 +5,8 @@
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -67,7 +69,10 @@
throw new CoolException("瀛愬垪琛ㄦ暟鎹负绌猴紝璇锋煡璇O鍗曟槸鍚︽纭綍鍏ワ紒锛�");
}
AsnOrder order = new AsnOrder();
+ //鏍规嵁缂栫爜瑙勫垯鐢熸垚ASN鍗曞彿
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
order.setAnfme(purchase.getAnfme())
+ .setCode(code)
.setArrTime(purchase.getPreArr())
.setQty(purchase.getQty())
.setPoId(purchase.getId())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
index bc92ad9..6fdeb55 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
@@ -9,5 +9,13 @@
*/
public class SerialRuleCode {
+ /**
+ * 绯荤粺PO鍗曞悓姝ョ紪鐮佽鍒�
+ */
public final static String PURCHASE_CODE = "sys_purchase_code";
+
+ /**
+ * ASN閫氱煡鍗曠敓鎴愮紪鐮佽鍒�
+ */
+ public final static String SYS_ASN_ORDER = "sys_ans_order";
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
index c026c72..02a3c1b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
@@ -41,7 +41,7 @@
.getOne(new LambdaQueryWrapper<SerialRule>()
.eq(SerialRule::getCode, code));
if (Objects.isNull(serialRule)) {
- throw new CoolException("閲囪喘缂栫爜瑙勫垯涓嶅瓨鍦紒锛�");
+ throw new CoolException("褰撳墠涓氬姟锛�" + code + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
SerialRuleItemService serialRuleItemService = SpringUtils.getBean(SerialRuleItemService.class);
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index f63202c..53ce113 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -65,4 +65,10 @@
password: xltys1995
port: 6379
timeout: 5000
- index: 15
\ No newline at end of file
+ index: 15
+
+stock:
+ flagPrinter: false
+ inspect:
+ flagAvailable: true
+ flagReceiving: false
\ No newline at end of file
diff --git a/rsf-server/src/main/resources/application-prod.yml b/rsf-server/src/main/resources/application-prod.yml
index ecc2fc2..1c91565 100644
--- a/rsf-server/src/main/resources/application-prod.yml
+++ b/rsf-server/src/main/resources/application-prod.yml
@@ -62,4 +62,7 @@
password: xltys1995
port: 6379
timeout: 5000
- index: 11
\ No newline at end of file
+ index: 11
+
+stock:
+ flagAvailable: true
--
Gitblit v1.9.1