From b11e65af82ff4a8608e98811d590690e30781696 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 14:01:55 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/locRevise/LocRevisePanel.jsx | 93 +++++
rsf-admin/src/page/locRevise/index.jsx | 18 +
rsf-admin/src/page/locRevise/LocReviseEdit.jsx | 136 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java | 252 ++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java | 112 ++++++
rsf-admin/src/page/locRevise/LocReviseList.jsx | 175 +++++++++
rsf-server/src/main/java/locRevise.sql | 28 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocReviseServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocReviseService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocReviseMapper.java | 12
rsf-server/src/main/resources/mapper/manager/LocReviseMapper.xml | 5
rsf-admin/src/page/components/PageEditDrawer.jsx | 2
rsf-admin/src/page/locRevise/LocReviseCreate.jsx | 164 +++++++++
rsf-admin/src/i18n/zh.js | 12
rsf-admin/src/i18n/en.js | 11
rsf-admin/src/page/ResourceContent.js | 3
17 files changed, 1,042 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 4c30e8a..cb9ec00 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -211,7 +211,7 @@
waveRule: 'Wave Rules',
checkDiff: 'Check Diff',
transfer: 'Transfer',
-
+ locRevise: 'Loc Revise',
},
table: {
field: {
@@ -902,6 +902,15 @@
anfme: "anfme",
ioStatus: "ioStatus",
},
+ locRevise: {
+ code: "code",
+ type: "type",
+ anfme: "anfme",
+ reviseQty: "Revise Qty",
+ exceStatus: "Exce Status",
+ orgAreaId: "Area Id",
+ orgAreaName: "Area Name",
+ },
waitPakinItem: {
pakinId: "pakinId",
maktx: "maktx",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index caa2ded..aee47ba 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -217,7 +217,8 @@
checkOrder: '鐩樼偣鍗�',
checkDiff: '鐩樼偣宸紓鍗�',
transfer: '璋冩嫈鍗�',
- transferItem: '璋冩嫈鍗曟槑缁�'
+ transferItem: '璋冩嫈鍗曟槑缁�',
+ locRevise: '搴撳瓨璋冩暣',
},
table: {
field: {
@@ -938,6 +939,15 @@
anfme: "鏁伴噺",
ioStatus: "鐘舵��",
},
+ locRevise: {
+ code: "璋冩暣鍗�",
+ type: "璋冩暣绫诲瀷",
+ anfme: "搴撳瓨鏁伴噺",
+ reviseQty: "瀹為檯鏁伴噺",
+ exceStatus: "鎵ц鐘舵��",
+ areaId: "搴撳尯ID",
+ areaName: "搴撳尯",
+ },
waitPakinItem: {
pakinId: "缁勬墭Id",
maktx: "鐗╂枡",
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index dcd570c..516597e 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -56,6 +56,7 @@
import check from "./orders/check";
import checkDiff from "./orders/check/checkDiff";
import transfer from "./orders/transfer";
+import locRevise from './locRevise';
const ResourceContent = (node) => {
@@ -164,6 +165,8 @@
return checkDiff;
case "transfer":
return transfer;
+ case "locRevise":
+ return locRevise;
default:
return {
list: ListGuesser,
diff --git a/rsf-admin/src/page/components/PageEditDrawer.jsx b/rsf-admin/src/page/components/PageEditDrawer.jsx
index 26b3d49..82d770d 100644
--- a/rsf-admin/src/page/components/PageEditDrawer.jsx
+++ b/rsf-admin/src/page/components/PageEditDrawer.jsx
@@ -26,7 +26,7 @@
open={!!drawerVal}
anchor="right"
onClose={handleClose}
- PaperProps={{ sx: { width: '90%' } }}
+ PaperProps={{ sx: { width: '89.2%' } }}
>
{!!drawerVal && (
<>
diff --git a/rsf-admin/src/page/locRevise/LocReviseCreate.jsx b/rsf-admin/src/page/locRevise/LocReviseCreate.jsx
new file mode 100644
index 0000000..c8f36e1
--- /dev/null
+++ b/rsf-admin/src/page/locRevise/LocReviseCreate.jsx
@@ -0,0 +1,164 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ CreateBase,
+ useTranslate,
+ TextInput,
+ NumberInput,
+ BooleanInput,
+ DateInput,
+ SaveButton,
+ SelectInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ Toolbar,
+ required,
+ useDataProvider,
+ useNotify,
+ Form,
+ useCreateController,
+} from 'react-admin';
+import {
+ Dialog,
+ DialogActions,
+ DialogContent,
+ DialogTitle,
+ Stack,
+ Grid,
+ Box,
+} from '@mui/material';
+import DialogCloseButton from "../components/DialogCloseButton";
+import StatusSelectInput from "../components/StatusSelectInput";
+import MemoInput from "../components/MemoInput";
+
+const LocReviseCreate = (props) => {
+ const { open, setOpen } = props;
+
+ const translate = useTranslate();
+ const notify = useNotify();
+
+ const handleClose = (event, reason) => {
+ if (reason !== "backdropClick") {
+ setOpen(false);
+ }
+ };
+
+ const handleSuccess = async (data) => {
+ setOpen(false);
+ notify('common.response.success');
+ };
+
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
+ };
+
+ return (
+ <>
+ <CreateBase
+ record={{}}
+ transform={(data) => {
+ return data;
+ }}
+ mutationOptions={{ onSuccess: handleSuccess, onError: handleError }}
+ >
+ <Dialog
+ open={open}
+ onClose={handleClose}
+ aria-labelledby="form-dialog-title"
+ fullWidth
+ disableRestoreFocus
+ maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
+ >
+ <Form>
+ <DialogTitle id="form-dialog-title" sx={{
+ position: 'sticky',
+ top: 0,
+ backgroundColor: 'background.paper',
+ zIndex: 1000
+ }}
+ >
+ {translate('create.title')}
+ <Box sx={{ position: 'absolute', top: 8, right: 8, zIndex: 1001 }}>
+ <DialogCloseButton onClose={handleClose} />
+ </Box>
+ </DialogTitle>
+ <DialogContent sx={{ mt: 2 }}>
+ <Grid container rowSpacing={2} columnSpacing={2}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.locRevise.code"
+ source="code"
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <SelectInput
+ label="table.field.locRevise.type"
+ source="type"
+ choices={[
+ { id: 0, name: ' 搴撳瓨璋冩暣' },
+ { id: 2, name: ' 鐩樼偣璋冩暣' },
+ ]}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.locRevise.anfme"
+ source="anfme"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.locRevise.reviseQty"
+ source="reviseQty"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <SelectInput
+ label="table.field.locRevise.exceStatus"
+ source="exceStatus"
+ choices={[
+ { id: 0, name: '鏈墽琛�' },
+ { id: 1, name: '鎵ц涓�' },
+ { id: 2, name: '鎵ц瀹屾垚' },
+ ]}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.locRevise.orgAreaId"
+ source="orgAreaId"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.locRevise.orgAreaName"
+ source="orgAreaName"
+ parse={v => v}
+ />
+ </Grid>
+
+ <Grid item xs={6} display="flex" gap={1}>
+ <StatusSelectInput />
+ </Grid>
+ <Grid item xs={12} display="flex" gap={1}>
+ <Stack direction="column" spacing={1} width={'100%'}>
+ <MemoInput />
+ </Stack>
+ </Grid>
+ </Grid>
+ </DialogContent>
+ <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
+ <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }} >
+ <SaveButton />
+ </Toolbar>
+ </DialogActions>
+ </Form>
+ </Dialog>
+ </CreateBase>
+ </>
+ )
+}
+
+export default LocReviseCreate;
diff --git a/rsf-admin/src/page/locRevise/LocReviseEdit.jsx b/rsf-admin/src/page/locRevise/LocReviseEdit.jsx
new file mode 100644
index 0000000..d1e9fda
--- /dev/null
+++ b/rsf-admin/src/page/locRevise/LocReviseEdit.jsx
@@ -0,0 +1,136 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ Edit,
+ SimpleForm,
+ FormDataConsumer,
+ useTranslate,
+ TextInput,
+ NumberInput,
+ BooleanInput,
+ DateInput,
+ SelectInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ SaveButton,
+ Toolbar,
+ Labeled,
+ NumberField,
+ required,
+ useRecordContext,
+ DeleteButton,
+} from 'react-admin';
+import { useWatch, useFormContext } from "react-hook-form";
+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";
+
+const FormToolbar = () => {
+ const { getValues } = useFormContext();
+
+ return (
+ <Toolbar sx={{ justifyContent: 'space-between' }}>
+ <SaveButton />
+ <DeleteButton mutationMode="optimistic" />
+ </Toolbar>
+ )
+}
+
+const LocReviseEdit = () => {
+ const translate = useTranslate();
+
+ return (
+ <Edit
+ redirect="list"
+ mutationMode={EDIT_MODE}
+ actions={<CustomerTopToolBar />}
+ aside={<EditBaseAside />}
+ >
+ <SimpleForm
+ shouldUnregister
+ warnWhenUnsavedChanges
+ toolbar={<FormToolbar />}
+ mode="onTouched"
+ defaultValues={{}}
+ // validate={(values) => { }}
+ >
+ <Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
+ <Grid item xs={12} md={8}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.main')}
+ </Typography>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.locRevise.code"
+ source="code"
+ parse={v => v}
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.locRevise.type"
+ source="type"
+ choices={[
+ { id: 0, name: ' 搴撳瓨璋冩暣' },
+ { id: 2, name: ' 鐩樼偣璋冩暣' },
+ ]}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.locRevise.anfme"
+ source="anfme"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.locRevise.reviseQty"
+ source="reviseQty"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.locRevise.exceStatus"
+ source="exceStatus"
+ choices={[
+ { id: 0, name: '鏈墽琛�' },
+ { id: 1, name: '鎵ц涓�' },
+ { id: 2, name: '鎵ц瀹屾垚' },
+ ]}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.locRevise.orgAreaId"
+ source="orgAreaId"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.locRevise.orgAreaName"
+ source="orgAreaName"
+ parse={v => v}
+ />
+ </Stack>
+
+ </Grid>
+ <Grid item xs={12} md={4}>
+ <Typography variant="h6" gutterBottom>
+ {translate('common.edit.title.common')}
+ </Typography>
+ <StatusSelectInput />
+ <Box mt="2em" />
+ <MemoInput />
+ </Grid>
+ </Grid>
+ </SimpleForm>
+ </Edit >
+ )
+}
+
+export default LocReviseEdit;
diff --git a/rsf-admin/src/page/locRevise/LocReviseList.jsx b/rsf-admin/src/page/locRevise/LocReviseList.jsx
new file mode 100644
index 0000000..26e4732
--- /dev/null
+++ b/rsf-admin/src/page/locRevise/LocReviseList.jsx
@@ -0,0 +1,175 @@
+import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
+import { useNavigate } from 'react-router-dom';
+import {
+ List,
+ DatagridConfigurable,
+ SearchInput,
+ TopToolbar,
+ SelectColumnsButton,
+ EditButton,
+ FilterButton,
+ CreateButton,
+ ExportButton,
+ BulkDeleteButton,
+ WrapperField,
+ useRecordContext,
+ useTranslate,
+ useNotify,
+ useListContext,
+ FunctionField,
+ TextField,
+ NumberField,
+ DateField,
+ BooleanField,
+ ReferenceField,
+ TextInput,
+ DateTimeInput,
+ DateInput,
+ SelectInput,
+ NumberInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ DeleteButton,
+} from 'react-admin';
+import { Box, Typography, Card, Stack } from '@mui/material';
+import { styled } from '@mui/material/styles';
+import LocReviseCreate from "./LocReviseCreate";
+import LocRevisePanel from "./LocRevisePanel";
+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';
+
+const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
+ '& .css-1vooibu-MuiSvgIcon-root': {
+ height: '.9em'
+ },
+ '& .RaDatagrid-row': {
+ cursor: 'auto'
+ },
+ '& .column-name': {
+ },
+ '& .opt': {
+ width: 200
+ },
+}));
+
+const filters = [
+ <SearchInput source="condition" alwaysOn />,
+ <DateInput label='common.time.after' source="timeStart" alwaysOn />,
+ <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
+
+ <TextInput source="code" label="table.field.locRevise.code" />,
+ <SelectInput source="type" label="table.field.locRevise.type"
+ choices={[
+ { id: 0, name: ' 搴撳瓨璋冩暣' },
+ { id: 2, name: ' 鐩樼偣璋冩暣' },
+ ]}
+ />,
+ <NumberInput source="anfme" label="table.field.locRevise.anfme" />,
+ <NumberInput source="reviseQty" label="table.field.locRevise.reviseQty" />,
+ <SelectInput source="exceStatus" label="table.field.locRevise.exceStatus"
+ choices={[
+ { id: 0, name: '鏈墽琛�' },
+ { id: 1, name: '鎵ц涓�' },
+ { id: 2, name: '鎵ц瀹屾垚' },
+ ]}
+ />,
+ <NumberInput source="orgAreaId" label="table.field.locRevise.orgAreaId" />,
+ <TextInput source="orgAreaName" label="table.field.locRevise.orgAreaName" />,
+
+ <TextInput label="common.field.memo" source="memo" />,
+ <SelectInput
+ label="common.field.status"
+ source="status"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ resettable
+ />,
+]
+
+const LocReviseList = () => {
+ const translate = useTranslate();
+
+ const [createDialog, setCreateDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
+
+ return (
+ <Box display="flex">
+ <List
+ sx={{
+ flexGrow: 1,
+ transition: (theme) =>
+ theme.transitions.create(['all'], {
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ }}
+ title={"menu.locRevise"}
+ empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ filters={filters}
+ sort={{ field: "create_time", order: "desc" }}
+ actions={(
+ <TopToolbar>
+ <FilterButton />
+ <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ <SelectColumnsButton preferenceKey='locRevise' />
+ <MyExportButton />
+ </TopToolbar>
+ )}
+ perPage={DEFAULT_PAGE_SIZE}
+ >
+ <StyledDatagrid
+ preferenceKey='locRevise'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={() => <LocRevisePanel />}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo']}
+ >
+ <NumberField source="id" />
+ <TextField source="code" label="table.field.locRevise.code" />
+ <TextField source="type$" label="table.field.locRevise.type" sortable={false} />
+ <NumberField source="anfme" label="table.field.locRevise.anfme" />
+ <NumberField source="reviseQty" label="table.field.locRevise.reviseQty" />
+ <TextField source="exceStatus$" label="table.field.locRevise.exceStatus" sortable={false} />
+ <NumberField source="orgAreaId" label="table.field.locRevise.orgAreaId" />
+ <TextField source="orgAreaName" label="table.field.locRevise.orgAreaName" />
+
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <DateField source="createTime" label="common.field.createTime" showTime />
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <TextField source="memo" label="common.field.memo" sortable={false} />
+ <WrapperField cellClassName="opt" label="common.field.opt">
+ <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+ <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ </WrapperField>
+ </StyledDatagrid>
+ </List>
+ <LocReviseCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ <PageDrawer
+ title='LocRevise Detail'
+ drawerVal={drawerVal}
+ setDrawerVal={setDrawerVal}
+ >
+ </PageDrawer>
+ </Box>
+ )
+}
+
+export default LocReviseList;
diff --git a/rsf-admin/src/page/locRevise/LocRevisePanel.jsx b/rsf-admin/src/page/locRevise/LocRevisePanel.jsx
new file mode 100644
index 0000000..8ad740f
--- /dev/null
+++ b/rsf-admin/src/page/locRevise/LocRevisePanel.jsx
@@ -0,0 +1,93 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material';
+import {
+ useTranslate,
+ useRecordContext,
+} from 'react-admin';
+import PanelTypography from "../components/PanelTypography";
+import * as Common from '@/utils/common'
+
+const LocRevisePanel = () => {
+ const record = useRecordContext();
+ if (!record) return null;
+ const translate = useTranslate();
+ return (
+ <>
+ <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}>
+ <CardContent>
+ <Grid container spacing={2}>
+ <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
+ <Typography variant="h6" gutterBottom align="left" sx={{
+ maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' },
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ }}>
+ {Common.camelToPascalWithSpaces(translate('table.field.locRevise.id'))}: {record.id}
+ </Typography>
+ {/* inherit, primary, secondary, textPrimary, textSecondary, error */}
+ <Typography variant="h6" gutterBottom align="right" >
+ ID: {record.id}
+ </Typography>
+ </Grid>
+ </Grid>
+ <Grid container spacing={2}>
+ <Grid item xs={12} container alignContent="flex-end">
+ <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}>
+ {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo}
+ </Typography>
+ </Grid>
+ </Grid>
+ <Box height={20}> </Box>
+ <Grid container spacing={2}>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.locRevise.code"
+ property={record.code}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.locRevise.type"
+ property={record.type$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.locRevise.anfme"
+ property={record.anfme}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.locRevise.reviseQty"
+ property={record.reviseQty}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.locRevise.exceStatus"
+ property={record.exceStatus$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.locRevise.orgAreaId"
+ property={record.orgAreaId}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.locRevise.orgAreaName"
+ property={record.orgAreaName}
+ />
+ </Grid>
+
+ </Grid>
+ </CardContent>
+ </Card >
+ </>
+ );
+};
+
+export default LocRevisePanel;
diff --git a/rsf-admin/src/page/locRevise/index.jsx b/rsf-admin/src/page/locRevise/index.jsx
new file mode 100644
index 0000000..cd45749
--- /dev/null
+++ b/rsf-admin/src/page/locRevise/index.jsx
@@ -0,0 +1,18 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ ListGuesser,
+ EditGuesser,
+ ShowGuesser,
+} from "react-admin";
+
+import LocReviseList from "./LocReviseList";
+import LocReviseEdit from "./LocReviseEdit";
+
+export default {
+ list: LocReviseList,
+ edit: LocReviseEdit,
+ show: ShowGuesser,
+ recordRepresentation: (record) => {
+ return `${record.id}`
+ }
+};
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index ee08141..8c55e4e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table = "man_transfer_order";
- generator.tableDesc = "璋冩嫈鍗曡鍗曞叧鑱旇〃";
+ generator.table = "man_loc_revise";
+ generator.tableDesc = "搴撳瓨璋冩暣鍗�";
generator.packagePath = "com.vincent.rsf.server.manager";
generator.build();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
new file mode 100644
index 0000000..4c6f0b6
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocReviseController.java
@@ -0,0 +1,112 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.LocRevise;
+import com.vincent.rsf.server.manager.service.LocReviseService;
+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.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@Api("搴撳瓨璋冩暣鍗�")
+@RestController
+public class LocReviseController extends BaseController {
+
+ @Autowired
+ private LocReviseService locReviseService;
+
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
+ @PostMapping("/locRevise/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocRevise, BaseParam> pageParam = new PageParam<>(baseParam, LocRevise.class);
+ return R.ok().add(locReviseService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
+ @PostMapping("/locRevise/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(locReviseService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
+ @PostMapping({"/locRevise/many/{ids}", "/locRevises/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(locReviseService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
+ @GetMapping("/locRevise/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(locReviseService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:save')")
+ @OperationLog("Create 搴撳瓨璋冩暣鍗�")
+ @PostMapping("/locRevise/save")
+ public R save(@RequestBody LocRevise locRevise) {
+ locRevise.setCreateBy(getLoginUserId());
+ locRevise.setCreateTime(new Date());
+ locRevise.setUpdateBy(getLoginUserId());
+ locRevise.setUpdateTime(new Date());
+ if (!locReviseService.save(locRevise)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(locRevise);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:update')")
+ @OperationLog("Update 搴撳瓨璋冩暣鍗�")
+ @PostMapping("/locRevise/update")
+ public R update(@RequestBody LocRevise locRevise) {
+ locRevise.setUpdateBy(getLoginUserId());
+ locRevise.setUpdateTime(new Date());
+ if (!locReviseService.updateById(locRevise)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(locRevise);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:remove')")
+ @OperationLog("Delete 搴撳瓨璋冩暣鍗�")
+ @PostMapping("/locRevise/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!locReviseService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
+ @PostMapping("/locRevise/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocRevise> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocRevise::getId, condition);
+ }
+ locReviseService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:locRevise:list')")
+ @PostMapping("/locRevise/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(locReviseService.list(), LocRevise.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java
new file mode 100644
index 0000000..069424c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocRevise.java
@@ -0,0 +1,252 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_loc_revise")
+public class LocRevise implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璋冩暣鍗�
+ */
+ @ApiModelProperty(value= "璋冩暣鍗�")
+ private String code;
+
+ /**
+ * 鍗曟嵁绫诲瀷 0: 搴撳瓨璋冩暣 2: 鐩樼偣璋冩暣
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷 0: 搴撳瓨璋冩暣 2: 鐩樼偣璋冩暣 ")
+ private Integer type;
+
+ /**
+ * 鍗曟嵁鏁伴噺
+ */
+ @ApiModelProperty(value= "鍗曟嵁鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 瀹為檯鏁伴噺
+ */
+ @ApiModelProperty(value= "瀹為檯鏁伴噺")
+ private Double reviseQty;
+
+ /**
+ * 鎵ц鐘舵��: 0: 鏈墽琛� 1: 鎵ц涓� 2: 鎵ц瀹屾垚
+ */
+ @ApiModelProperty(value= "鎵ц鐘舵��: 0: 鏈墽琛� 1: 鎵ц涓� 2: 鎵ц瀹屾垚 ")
+ private Integer exceStatus;
+
+ /**
+ * 婧愬簱鍖篒D
+ */
+ @ApiModelProperty(value= "婧愬簱鍖篒D")
+ private Long orgAreaId;
+
+ /**
+ * 鍘熷簱鍖哄悕绉�
+ */
+ @ApiModelProperty(value= "鍘熷簱鍖哄悕绉�")
+ private String orgAreaName;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public LocRevise() {}
+
+ public LocRevise(String code,Integer type,Double anfme,Double reviseQty,Integer exceStatus,Long orgAreaId,String orgAreaName,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.code = code;
+ this.type = type;
+ this.anfme = anfme;
+ this.reviseQty = reviseQty;
+ this.exceStatus = exceStatus;
+ this.orgAreaId = orgAreaId;
+ this.orgAreaName = orgAreaName;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// LocRevise locRevise = new LocRevise(
+// null, // 璋冩暣鍗�
+// null, // 鍗曟嵁绫诲瀷
+// null, // 鍗曟嵁鏁伴噺
+// null, // 瀹為檯鏁伴噺
+// null, // 鎵ц鐘舵��:
+// null, // 婧愬簱鍖篒D
+// null, // 鍘熷簱鍖哄悕绉�
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case 0:
+ return " 搴撳瓨璋冩暣";
+ case 2:
+ return " 鐩樼偣璋冩暣";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
+
+ public String getExceStatus$(){
+ if (null == this.exceStatus){ return null; }
+ switch (this.exceStatus){
+ case 0:
+ return "鏈墽琛�";
+ case 1:
+ return "鎵ц涓�";
+ case 2:
+ return "鎵ц瀹屾垚";
+ default:
+ return String.valueOf(this.exceStatus);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocReviseMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocReviseMapper.java
new file mode 100644
index 0000000..ef191c9
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/LocReviseMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.LocRevise;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocReviseMapper extends BaseMapper<LocRevise> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocReviseService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocReviseService.java
new file mode 100644
index 0000000..143c2cd
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/LocReviseService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.LocRevise;
+
+public interface LocReviseService extends IService<LocRevise> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocReviseServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocReviseServiceImpl.java
new file mode 100644
index 0000000..545c1ad
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocReviseServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.LocReviseMapper;
+import com.vincent.rsf.server.manager.entity.LocRevise;
+import com.vincent.rsf.server.manager.service.LocReviseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locReviseService")
+public class LocReviseServiceImpl extends ServiceImpl<LocReviseMapper, LocRevise> implements LocReviseService {
+
+}
diff --git a/rsf-server/src/main/java/locRevise.sql b/rsf-server/src/main/java/locRevise.sql
new file mode 100644
index 0000000..bd844af
--- /dev/null
+++ b/rsf-server/src/main/java/locRevise.sql
@@ -0,0 +1,28 @@
+-- save locRevise record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.locRevise', '0', '/manager/locRevise', 'locRevise', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 搴撳瓨璋冩暣鍗�', '', '1', 'manager:locRevise:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 搴撳瓨璋冩暣鍗�', '', '1', 'manager:locRevise:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 搴撳瓨璋冩暣鍗�', '', '1', 'manager:locRevise:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 搴撳瓨璋冩暣鍗�', '', '1', 'manager:locRevise:remove', '3', '1', '1');
+
+-- locale menu name
+locRevise: 'LocRevise',
+
+-- locale field
+locRevise: {
+ code: "code",
+ type: "type",
+ anfme: "anfme",
+ reviseQty: "reviseQty",
+ exceStatus: "exceStatus",
+ orgAreaId: "orgAreaId",
+ orgAreaName: "orgAreaName",
+},
+
+-- ResourceContent
+import locRevise from './locRevise';
+
+case 'locRevise':
+ return locRevise;
diff --git a/rsf-server/src/main/resources/mapper/manager/LocReviseMapper.xml b/rsf-server/src/main/resources/mapper/manager/LocReviseMapper.xml
new file mode 100644
index 0000000..73b8c7d
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/LocReviseMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.LocReviseMapper">
+
+</mapper>
--
Gitblit v1.9.1