#优化 1. 路由层级修改

skyouc

2025-03-06 666edb2c889556d3d963c341241cf43fafd32434

#优化
1. 路由层级修改

 rsf-admin/src/page/basicInfo/loc/LocCreate.jsx

File was renamed from rsf-admin/src/page/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;

 rsf-admin/src/page/basicInfo/loc/LocEdit.jsx

File was renamed from rsf-admin/src/page/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();

 rsf-admin/src/page/basicInfo/loc/LocList.jsx

File was renamed from rsf-admin/src/page/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';


 rsf-admin/src/page/basicInfo/loc/LocPanel.jsx

File was renamed from rsf-admin/src/page/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 = () => {

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

 rsf-admin/src/page/system/dicts/dictData/DictDataCreate.jsx

File was renamed from rsf-admin/src/page/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;

 rsf-admin/src/page/system/dicts/dictData/DictDataEdit.jsx

File was renamed from rsf-admin/src/page/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();

 rsf-admin/src/page/system/dicts/dictData/DictDataList.jsx

File was renamed from rsf-admin/src/page/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 }) => ({

 rsf-admin/src/page/system/dicts/dictData/DictDataPanel.jsx

File was renamed from rsf-admin/src/page/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 = () => {

 rsf-admin/src/page/system/dicts/dictData/index.jsx

 rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx

File was renamed from rsf-admin/src/page/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;

 rsf-admin/src/page/system/dicts/dictType/DictTypeEdit.jsx

File was renamed from rsf-admin/src/page/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();

 rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx

File was renamed from rsf-admin/src/page/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';


 rsf-admin/src/page/system/dicts/dictType/DictTypePanel.jsx

File was renamed from rsf-admin/src/page/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 = () => {

 rsf-admin/src/page/system/dicts/dictType/index.jsx

 rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx

File was renamed from rsf-admin/src/page/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;

 rsf-admin/src/page/system/serialRule/SerialRuleEdit.jsx

File was renamed from rsf-admin/src/page/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();

 rsf-admin/src/page/system/serialRule/SerialRuleList.jsx

File was renamed from rsf-admin/src/page/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';


 rsf-admin/src/page/system/serialRule/SerialRulePanel.jsx

File was renamed from rsf-admin/src/page/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 = () => {

 rsf-admin/src/page/system/serialRule/index.jsx

 rsf-admin/src/page/system/serialRuleItem/SerialRuleItemCreate.jsx

File was renamed from rsf-admin/src/page/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;

 rsf-admin/src/page/system/serialRuleItem/SerialRuleItemEdit.jsx

File was renamed from rsf-admin/src/page/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();

 rsf-admin/src/page/system/serialRuleItem/SerialRuleItemList.jsx

File was renamed from rsf-admin/src/page/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';


 rsf-admin/src/page/system/serialRuleItem/SerialRuleItemPanel.jsx

File was renamed from rsf-admin/src/page/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 = () => {

 rsf-admin/src/page/system/serialRuleItem/index.jsx

 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;

 rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java

New file
@@ -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;

    }

}

 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();
    }


}

 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;

 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("子列表数据为空，请查询PO单是否正确录入！！");
            }
            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())

 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";
}

 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);


 rsf-server/src/main/resources/application-dev.yml

@@ -65,4 +65,10 @@
  password: xltys1995
  port: 6379
  timeout: 5000
  index: 15
  index: 15

stock:
  flagPrinter: false
  inspect:
    flagAvailable: true
    flagReceiving: false

 rsf-server/src/main/resources/application-prod.yml

@@ -62,4 +62,7 @@
  password: xltys1995
  port: 6379
  timeout: 5000
  index: 11
  index: 11

stock:
  flagAvailable: true