From b3b117424d3405190cf482f9236a40295ef2a447 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 11 三月 2025 15:11:39 +0800
Subject: [PATCH] #新增 1. 添加扩展字段 2. 添加扩展字段明细
---
rsf-admin/src/page/fieldsItem/FieldsItemPanel.jsx | 81 ++
rsf-server/src/main/resources/mapper/system/FieldsItemMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java | 110 +++
rsf-admin/src/page/fields/FieldsList.jsx | 168 +++++
rsf-admin/src/page/fieldsItem/FieldsItemList.jsx | 160 +++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 9
rsf-admin/src/page/fields/FieldsPanel.jsx | 75 ++
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 6
rsf-admin/src/page/fields/FieldsCreate.jsx | 145 ++++
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java | 110 +++
rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java | 210 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsItemService.java | 8
rsf-admin/src/i18n/zh.js | 15
rsf-admin/src/i18n/en.js | 15
rsf-admin/src/page/ResourceContent.js | 6
rsf-admin/src/page/fields/FieldsEdit.jsx | 119 +++
rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/FieldsMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 5
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsItemServiceImpl.java | 12
rsf-admin/src/page/fieldsItem/FieldsItemCreate.jsx | 143 ++++
rsf-admin/src/page/fieldsItem/index.jsx | 18
rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/FieldsItemMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsServiceImpl.java | 12
rsf-admin/src/page/fields/index.jsx | 18
rsf-server/src/main/resources/mapper/system/FieldsMapper.xml | 5
rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx | 115 +++
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java | 226 +++++++
28 files changed, 1,818 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index de2d385..7b12baf 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -140,6 +140,8 @@
purchase: 'Purchase',
purchaseItem: 'PurchaseItem',
whMat: 'Warehouse Mat',
+ fields: 'Extend Fields',
+ fieldsItem: 'Extend Fields Items',
},
table: {
field: {
@@ -464,6 +466,19 @@
splrCode: "splrCode",
splrBatch: "splrBatch",
},
+ fields: {
+ fields: "Fields",
+ fieldsAlise: "FieldsAlise",
+ unique: "Unique",
+ flagEnable: "FlagEnable",
+ },
+ fieldsItem: {
+ uuid: "uuid",
+ fieldsId: "FieldsId",
+ value: "Value",
+ matnrId: "MatnrId",
+ shiperId: "Shipper",
+ },
}
},
page: {
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 0b1ed79..1551bc2 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -139,6 +139,8 @@
purchase: 'PO鍗�',
purchaseItem: 'PO鍗曟槑缁�',
whMat: '搴撳尯鐗╂枡鍏崇郴',
+ fields: '鎵╁睍瀛楁',
+ fieldsItem: '鎵╁睍瀛楁鏄庣粏',
},
table: {
field: {
@@ -464,6 +466,19 @@
splrCode: "渚涘簲鍟嗙紪鐮�",
splrBatch: "渚涘簲鍟嗘壒娆�",
},
+ fields: {
+ fields: "瀛楁",
+ fieldsAlise: "瀛楁鍒悕",
+ unique: "绱㈠紩瀛楁",
+ flagEnable: "鍚敤",
+ },
+ fieldsItem: {
+ uuid: "鍞竴鏍囪瘑",
+ fieldsId: "涓诲崟瀛楁鏍囪瘑",
+ value: "value",
+ matnrId: "matnrId",
+ shiperId: "shiperId",
+ },
}
},
page: {
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index 448aec3..6f35cdf 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -31,6 +31,8 @@
import asnOrderItem from './asnOrderItem';
import purchaseItem from './purchaseItem';
import purchase from './purchase';
+import fields from './fields';
+import fieldsItem from './fieldsItem';
const ResourceContent = (node) => {
@@ -89,6 +91,10 @@
return purchaseItem;
case 'purchase':
return purchase;
+ case 'fields':
+ return fields;
+ case 'fieldsItem':
+ return fieldsItem;
default:
return {
list: ListGuesser,
diff --git a/rsf-admin/src/page/fields/FieldsCreate.jsx b/rsf-admin/src/page/fields/FieldsCreate.jsx
new file mode 100644
index 0000000..cd84b28
--- /dev/null
+++ b/rsf-admin/src/page/fields/FieldsCreate.jsx
@@ -0,0 +1,145 @@
+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 FieldsCreate = (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.fields.fields"
+ source="fields"
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.fields.fieldsAlise"
+ source="fieldsAlise"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <SelectInput
+ label="table.field.fields.unique"
+ source="unique"
+ choices={[
+ { id: 0, name: ' 闈炲敮涓�' },
+ { id: 1, name: ' 鍞竴' },
+ ]}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <SelectInput
+ label="table.field.fields.flagEnable"
+ source="flagEnable"
+ choices={[
+ { id: 0, name: ' 涓嶅惎鐢�' },
+ { id: 1, name: ' 鍚敤' },
+ ]}
+ />
+ </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 FieldsCreate;
diff --git a/rsf-admin/src/page/fields/FieldsEdit.jsx b/rsf-admin/src/page/fields/FieldsEdit.jsx
new file mode 100644
index 0000000..de6bcea
--- /dev/null
+++ b/rsf-admin/src/page/fields/FieldsEdit.jsx
@@ -0,0 +1,119 @@
+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 FieldsEdit = () => {
+ 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.fields.fields"
+ source="fields"
+ parse={v => v}
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.fields.fieldsAlise"
+ source="fieldsAlise"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.fields.unique"
+ source="unique"
+ choices={[
+ { id: 0, name: ' 闈炲敮涓�' },
+ { id: 1, name: ' 鍞竴' },
+ ]}
+ validate={required()}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.fields.flagEnable"
+ source="flagEnable"
+ choices={[
+ { id: 0, name: ' 涓嶅惎鐢�' },
+ { id: 1, name: ' 鍚敤' },
+ ]}
+ validate={required()}
+ />
+ </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 FieldsEdit;
diff --git a/rsf-admin/src/page/fields/FieldsList.jsx b/rsf-admin/src/page/fields/FieldsList.jsx
new file mode 100644
index 0000000..5c1f785
--- /dev/null
+++ b/rsf-admin/src/page/fields/FieldsList.jsx
@@ -0,0 +1,168 @@
+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 FieldsCreate from "./FieldsCreate";
+import FieldsPanel from "./FieldsPanel";
+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="fields" label="table.field.fields.fields" />,
+ <TextInput source="fieldsAlise" label="table.field.fields.fieldsAlise" />,
+ <SelectInput source="unique" label="table.field.fields.unique"
+ choices={[
+ { id: 0, name: ' 闈炲敮涓�' },
+ { id: 1, name: ' 鍞竴' },
+ ]}
+ />,
+ <SelectInput source="flagEnable" label="table.field.fields.flagEnable"
+ choices={[
+ { id: 0, name: ' 涓嶅惎鐢�' },
+ { id: 1, name: ' 鍚敤' },
+ ]}
+ />,
+
+ <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 FieldsList = () => {
+ 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.fields"}
+ empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ filters={filters}
+ sort={{ field: "create_time", order: "desc" }}
+ actions={(
+ <TopToolbar>
+ <FilterButton />
+ <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ <SelectColumnsButton preferenceKey='fields' />
+ <MyExportButton />
+ </TopToolbar>
+ )}
+ perPage={DEFAULT_PAGE_SIZE}
+ >
+ <StyledDatagrid
+ preferenceKey='fields'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={() => <FieldsPanel />}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo']}
+ >
+ <NumberField source="id" />
+ <TextField source="fields" label="table.field.fields.fields" />
+ <TextField source="fieldsAlise" label="table.field.fields.fieldsAlise" />
+ <TextField source="unique$" label="table.field.fields.unique" sortable={false} />
+ <TextField source="flagEnable$" label="table.field.fields.flagEnable" sortable={false} />
+
+ <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>
+ <FieldsCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ <PageDrawer
+ title='Fields Detail'
+ drawerVal={drawerVal}
+ setDrawerVal={setDrawerVal}
+ >
+ </PageDrawer>
+ </Box>
+ )
+}
+
+export default FieldsList;
diff --git a/rsf-admin/src/page/fields/FieldsPanel.jsx b/rsf-admin/src/page/fields/FieldsPanel.jsx
new file mode 100644
index 0000000..6891563
--- /dev/null
+++ b/rsf-admin/src/page/fields/FieldsPanel.jsx
@@ -0,0 +1,75 @@
+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 FieldsPanel = () => {
+ 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.fields.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.fields.fields"
+ property={record.fields}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.fields.fieldsAlise"
+ property={record.fieldsAlise}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.fields.unique"
+ property={record.unique$}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.fields.flagEnable"
+ property={record.flagEnable$}
+ />
+ </Grid>
+
+ </Grid>
+ </CardContent>
+ </Card >
+ </>
+ );
+};
+
+export default FieldsPanel;
diff --git a/rsf-admin/src/page/fields/index.jsx b/rsf-admin/src/page/fields/index.jsx
new file mode 100644
index 0000000..0063d76
--- /dev/null
+++ b/rsf-admin/src/page/fields/index.jsx
@@ -0,0 +1,18 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ ListGuesser,
+ EditGuesser,
+ ShowGuesser,
+} from "react-admin";
+
+import FieldsList from "./FieldsList";
+import FieldsEdit from "./FieldsEdit";
+
+export default {
+ list: FieldsList,
+ edit: FieldsEdit,
+ show: ShowGuesser,
+ recordRepresentation: (record) => {
+ return `${record.id}`
+ }
+};
diff --git a/rsf-admin/src/page/fieldsItem/FieldsItemCreate.jsx b/rsf-admin/src/page/fieldsItem/FieldsItemCreate.jsx
new file mode 100644
index 0000000..60f8851
--- /dev/null
+++ b/rsf-admin/src/page/fieldsItem/FieldsItemCreate.jsx
@@ -0,0 +1,143 @@
+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 FieldsItemCreate = (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.fieldsItem.uuid"
+ source="uuid"
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.fieldsItem.fieldsId"
+ source="fieldsId"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.fieldsItem.value"
+ source="value"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.fieldsItem.matnrId"
+ source="matnrId"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.fieldsItem.shiperId"
+ source="shiperId"
+ />
+ </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 FieldsItemCreate;
diff --git a/rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx b/rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx
new file mode 100644
index 0000000..cb80bae
--- /dev/null
+++ b/rsf-admin/src/page/fieldsItem/FieldsItemEdit.jsx
@@ -0,0 +1,115 @@
+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 FieldsItemEdit = () => {
+ 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.fieldsItem.uuid"
+ source="uuid"
+ parse={v => v}
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.fieldsItem.fieldsId"
+ source="fieldsId"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="table.field.fieldsItem.value"
+ source="value"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.fieldsItem.matnrId"
+ source="matnrId"
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <NumberInput
+ label="table.field.fieldsItem.shiperId"
+ source="shiperId"
+ />
+ </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 FieldsItemEdit;
diff --git a/rsf-admin/src/page/fieldsItem/FieldsItemList.jsx b/rsf-admin/src/page/fieldsItem/FieldsItemList.jsx
new file mode 100644
index 0000000..41c2121
--- /dev/null
+++ b/rsf-admin/src/page/fieldsItem/FieldsItemList.jsx
@@ -0,0 +1,160 @@
+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 FieldsItemCreate from "./FieldsItemCreate";
+import FieldsItemPanel from "./FieldsItemPanel";
+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="uuid" label="table.field.fieldsItem.uuid" />,
+ <NumberInput source="fieldsId" label="table.field.fieldsItem.fieldsId" />,
+ <TextInput source="value" label="table.field.fieldsItem.value" />,
+ <NumberInput source="matnrId" label="table.field.fieldsItem.matnrId" />,
+ <NumberInput source="shiperId" label="table.field.fieldsItem.shiperId" />,
+
+ <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 FieldsItemList = () => {
+ 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.fieldsItem"}
+ empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ filters={filters}
+ sort={{ field: "create_time", order: "desc" }}
+ actions={(
+ <TopToolbar>
+ <FilterButton />
+ <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ <SelectColumnsButton preferenceKey='fieldsItem' />
+ <MyExportButton />
+ </TopToolbar>
+ )}
+ perPage={DEFAULT_PAGE_SIZE}
+ >
+ <StyledDatagrid
+ preferenceKey='fieldsItem'
+ bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ rowClick={(id, resource, record) => false}
+ expand={() => <FieldsItemPanel />}
+ expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo']}
+ >
+ <NumberField source="id" />
+ <TextField source="uuid" label="table.field.fieldsItem.uuid" />
+ <NumberField source="fieldsId" label="table.field.fieldsItem.fieldsId" />
+ <TextField source="value" label="table.field.fieldsItem.value" />
+ <NumberField source="matnrId" label="table.field.fieldsItem.matnrId" />
+ <NumberField source="shiperId" label="table.field.fieldsItem.shiperId" />
+
+ <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>
+ <FieldsItemCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ <PageDrawer
+ title='FieldsItem Detail'
+ drawerVal={drawerVal}
+ setDrawerVal={setDrawerVal}
+ >
+ </PageDrawer>
+ </Box>
+ )
+}
+
+export default FieldsItemList;
diff --git a/rsf-admin/src/page/fieldsItem/FieldsItemPanel.jsx b/rsf-admin/src/page/fieldsItem/FieldsItemPanel.jsx
new file mode 100644
index 0000000..05e1bdb
--- /dev/null
+++ b/rsf-admin/src/page/fieldsItem/FieldsItemPanel.jsx
@@ -0,0 +1,81 @@
+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 FieldsItemPanel = () => {
+ 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.fieldsItem.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.fieldsItem.uuid"
+ property={record.uuid}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.fieldsItem.fieldsId"
+ property={record.fieldsId}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.fieldsItem.value"
+ property={record.value}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.fieldsItem.matnrId"
+ property={record.matnrId}
+ />
+ </Grid>
+ <Grid item xs={6}>
+ <PanelTypography
+ title="table.field.fieldsItem.shiperId"
+ property={record.shiperId}
+ />
+ </Grid>
+
+ </Grid>
+ </CardContent>
+ </Card >
+ </>
+ );
+};
+
+export default FieldsItemPanel;
diff --git a/rsf-admin/src/page/fieldsItem/index.jsx b/rsf-admin/src/page/fieldsItem/index.jsx
new file mode 100644
index 0000000..b51523d
--- /dev/null
+++ b/rsf-admin/src/page/fieldsItem/index.jsx
@@ -0,0 +1,18 @@
+import React, { useState, useRef, useEffect, useMemo } from "react";
+import {
+ ListGuesser,
+ EditGuesser,
+ ShowGuesser,
+} from "react-admin";
+
+import FieldsItemList from "./FieldsItemList";
+import FieldsItemEdit from "./FieldsItemEdit";
+
+export default {
+ list: FieldsItemList,
+ edit: FieldsItemEdit,
+ show: ShowGuesser,
+ recordRepresentation: (record) => {
+ return `${record.id}`
+ }
+};
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
index cc8ee72..40f2243 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java
@@ -4,12 +4,10 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.OtherReceiptParams;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
-import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.apache.tika.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +15,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.List;
import java.util.Objects;
/**
@@ -79,7 +76,7 @@
* @param params
* @return
*/
- @PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
public R confirmReceipt(@RequestBody ReceiptParams params) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index a1846d2..6a5a632 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -146,7 +146,10 @@
if (Objects.isNull(params.getWhAreaId())) {
throw new CoolException("搴撳尯鏍囪瘑涓嶈兘涓虹┖锛侊紒");
}
- WarehouseAreasItem areasItem = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAreaId, params.getWhAreaId()));
+ WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
+ if (Objects.isNull(areasItem)) {
+ throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶅簱鍖轰笉瀛樺湪锛侊紒");
+ }
List<ReceiptDetlsDto> receipts = params.getReceipts();
List<WarehouseAreasItem> allOrders = new ArrayList<>();
receipts.forEach(dto -> {
@@ -156,8 +159,8 @@
}
WarehouseAreasItem item = new WarehouseAreasItem();
item.setBarcode(dto.getBarcode())
- .setAreaName(areasItem.getAreaName())
- .setAreaId(areasItem.getAreaId())
+ .setAreaName(areasItem.getName())
+ .setAreaId(areasItem.getId())
.setStockUnit(dto.getStockUnit())
.setBatch(SerialRuleUtils.generateRuleCode("sys_receipt_batch", dto))
.setAnfme(dto.getReceiptQty())
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 470edb8..7fc4da5 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,9 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_warehouse_areas_item";
- generator.tableDesc="鏀惰揣鍖哄簱瀛樹俊鎭�";
- generator.packagePath="com.vincent.rsf.server.manager";
+ generator.table="sys_fields_item";
+ generator.tableDesc="鎵╁睍瀛楁鏄庣粏琛�";
+ generator.packagePath="com.vincent.rsf.server.system";
generator.build();
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java
new file mode 100644
index 0000000..7cdb3fe
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.system.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.system.entity.Fields;
+import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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.*;
+
+@RestController
+public class FieldsController extends BaseController {
+
+ @Autowired
+ private FieldsService fieldsService;
+
+ @PreAuthorize("hasAuthority('system:fields:list')")
+ @PostMapping("/fields/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Fields, BaseParam> pageParam = new PageParam<>(baseParam, Fields.class);
+ return R.ok().add(fieldsService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:list')")
+ @PostMapping("/fields/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(fieldsService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:list')")
+ @PostMapping({"/fields/many/{ids}", "/fieldss/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(fieldsService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:list')")
+ @GetMapping("/fields/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(fieldsService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:save')")
+ @OperationLog("Create 鎵╁睍瀛楁")
+ @PostMapping("/fields/save")
+ public R save(@RequestBody Fields fields) {
+ fields.setCreateBy(getLoginUserId());
+ fields.setCreateTime(new Date());
+ fields.setUpdateBy(getLoginUserId());
+ fields.setUpdateTime(new Date());
+ if (!fieldsService.save(fields)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(fields);
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:update')")
+ @OperationLog("Update 鎵╁睍瀛楁")
+ @PostMapping("/fields/update")
+ public R update(@RequestBody Fields fields) {
+ fields.setUpdateBy(getLoginUserId());
+ fields.setUpdateTime(new Date());
+ if (!fieldsService.updateById(fields)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(fields);
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:remove')")
+ @OperationLog("Delete 鎵╁睍瀛楁")
+ @PostMapping("/fields/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!fieldsService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:list')")
+ @PostMapping("/fields/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Fields> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Fields::getId, condition);
+ }
+ fieldsService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:fields:list')")
+ @PostMapping("/fields/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(fieldsService.list(), Fields.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java
new file mode 100644
index 0000000..5d798c4
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/FieldsItemController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.system.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.system.entity.FieldsItem;
+import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.vincent.rsf.server.system.controller.BaseController;
+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.*;
+
+@RestController
+public class FieldsItemController extends BaseController {
+
+ @Autowired
+ private FieldsItemService fieldsItemService;
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:list')")
+ @PostMapping("/fieldsItem/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<FieldsItem, BaseParam> pageParam = new PageParam<>(baseParam, FieldsItem.class);
+ return R.ok().add(fieldsItemService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:list')")
+ @PostMapping("/fieldsItem/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(fieldsItemService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:list')")
+ @PostMapping({"/fieldsItem/many/{ids}", "/fieldsItems/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(fieldsItemService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:list')")
+ @GetMapping("/fieldsItem/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(fieldsItemService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:save')")
+ @OperationLog("Create 鎵╁睍瀛楁鏄庣粏琛�")
+ @PostMapping("/fieldsItem/save")
+ public R save(@RequestBody FieldsItem fieldsItem) {
+ fieldsItem.setCreateBy(getLoginUserId());
+ fieldsItem.setCreateTime(new Date());
+ fieldsItem.setUpdateBy(getLoginUserId());
+ fieldsItem.setUpdateTime(new Date());
+ if (!fieldsItemService.save(fieldsItem)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(fieldsItem);
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:update')")
+ @OperationLog("Update 鎵╁睍瀛楁鏄庣粏琛�")
+ @PostMapping("/fieldsItem/update")
+ public R update(@RequestBody FieldsItem fieldsItem) {
+ fieldsItem.setUpdateBy(getLoginUserId());
+ fieldsItem.setUpdateTime(new Date());
+ if (!fieldsItemService.updateById(fieldsItem)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(fieldsItem);
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:remove')")
+ @OperationLog("Delete 鎵╁睍瀛楁鏄庣粏琛�")
+ @PostMapping("/fieldsItem/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!fieldsItemService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:list')")
+ @PostMapping("/fieldsItem/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<FieldsItem> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(FieldsItem::getId, condition);
+ }
+ fieldsItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:fieldsItem:list')")
+ @PostMapping("/fieldsItem/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(fieldsItemService.list(), FieldsItem.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java
new file mode 100644
index 0000000..b0c0f07
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Fields.java
@@ -0,0 +1,226 @@
+package com.vincent.rsf.server.system.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+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.TableLogic;
+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("sys_fields")
+public class Fields implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鎵╁睍瀛楁涓昏〃
+ */
+ @ApiModelProperty(value= "鎵╁睍瀛楁涓昏〃")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍔ㄦ�佸瓧娈�
+ */
+ @ApiModelProperty(value= "鍔ㄦ�佸瓧娈�")
+ @TableField("`fields`")
+ private String fields;
+
+ /**
+ * 瀛楁鍒悕
+ */
+ @ApiModelProperty(value= "瀛楁鍒悕")
+ private String fieldsAlise;
+
+ /**
+ * 绱㈠紩瀛楁 0: 闈炲敮涓� 1: 鍞竴
+ */
+ @ApiModelProperty(value= "绱㈠紩瀛楁 0: 闈炲敮涓� 1: 鍞竴 ")
+ @TableField(value = "`unique`")
+ private Short unique;
+
+ /**
+ * 鏄惁鍚敤 0: 涓嶅惎鐢� 1: 鍚敤
+ */
+ @ApiModelProperty(value= "鏄惁鍚敤 0: 涓嶅惎鐢� 1: 鍚敤 ")
+ private Short flagEnable;
+
+ /**
+ * 鐘舵�� 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 Fields() {}
+
+ public Fields(String fields,String fieldsAlise,Short unique,Short flagEnable,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.fields = fields;
+ this.fieldsAlise = fieldsAlise;
+ this.unique = unique;
+ this.flagEnable = flagEnable;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// Fields fields = new Fields(
+// null, // 鍔ㄦ�佸瓧娈�
+// null, // 瀛楁鍒悕
+// null, // 绱㈠紩瀛楁 [闈炵┖]
+// null, // 鏄惁鍚敤[闈炵┖]
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getUnique$(){
+ if (null == this.unique){ return null; }
+ switch (this.unique){
+ case 0:
+ return " 闈炲敮涓�";
+ case 1:
+ return " 鍞竴";
+ default:
+ return String.valueOf(this.unique);
+ }
+ }
+
+ public String getFlagEnable$(){
+ if (null == this.flagEnable){ return null; }
+ switch (this.flagEnable){
+ case 0:
+ return " 涓嶅惎鐢�";
+ case 1:
+ return " 鍚敤";
+ default:
+ return String.valueOf(this.flagEnable);
+ }
+ }
+
+ 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/system/entity/FieldsItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java
new file mode 100644
index 0000000..4f0d218
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/FieldsItem.java
@@ -0,0 +1,210 @@
+package com.vincent.rsf.server.system.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("sys_fields_item")
+public class FieldsItem implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鎵╁睍瀛楁瀛愯〃
+ */
+ @ApiModelProperty(value= "鎵╁睍瀛楁瀛愯〃")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍞竴鏍囪瘑
+ */
+ @ApiModelProperty(value= "鍞竴鏍囪瘑")
+ private String uuid;
+
+ /**
+ * 鎵╁睍瀛楁鏍囪瘑
+ */
+ @ApiModelProperty(value= "鎵╁睍瀛楁鏍囪瘑")
+ private Long fieldsId;
+
+ /**
+ * 瀛楁鍊�
+ */
+ @ApiModelProperty(value= "瀛楁鍊�")
+ private String value;
+
+ /**
+ * 鐗╂枡鍞竴鏍囪瘑
+ */
+ @ApiModelProperty(value= "鐗╂枡鍞竴鏍囪瘑")
+ private Long matnrId;
+
+ /**
+ * 璐т富鏍囪瘑
+ */
+ @ApiModelProperty(value= "璐т富鏍囪瘑")
+ private Long shiperId;
+
+ /**
+ * 鐘舵�� 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 FieldsItem() {}
+
+ public FieldsItem(String uuid,Long fieldsId,String value,Long matnrId,Long shiperId,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.uuid = uuid;
+ this.fieldsId = fieldsId;
+ this.value = value;
+ this.matnrId = matnrId;
+ this.shiperId = shiperId;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// FieldsItem fieldsItem = new FieldsItem(
+// null, // 鍞竴鏍囪瘑
+// null, // 鎵╁睍瀛楁鏍囪瘑
+// null, // 瀛楁鍊�
+// null, // 鐗╂枡鍞竴鏍囪瘑
+// null, // 璐т富鏍囪瘑
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ 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/system/mapper/FieldsItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/FieldsItemMapper.java
new file mode 100644
index 0000000..9119a25
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/FieldsItemMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.mapper;
+
+import com.vincent.rsf.server.system.entity.FieldsItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface FieldsItemMapper extends BaseMapper<FieldsItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/FieldsMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/FieldsMapper.java
new file mode 100644
index 0000000..277e0bf
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/FieldsMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.mapper;
+
+import com.vincent.rsf.server.system.entity.Fields;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface FieldsMapper extends BaseMapper<Fields> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsItemService.java
new file mode 100644
index 0000000..5ac3604
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsItemService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.system.entity.FieldsItem;
+
+public interface FieldsItemService extends IService<FieldsItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsService.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsService.java
new file mode 100644
index 0000000..6e8bc25
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/FieldsService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.system.entity.Fields;
+
+public interface FieldsService extends IService<Fields> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsItemServiceImpl.java
new file mode 100644
index 0000000..71bb2fe
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsItemServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.service.impl;
+
+import com.vincent.rsf.server.system.mapper.FieldsItemMapper;
+import com.vincent.rsf.server.system.entity.FieldsItem;
+import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("fieldsItemService")
+public class FieldsItemServiceImpl extends ServiceImpl<FieldsItemMapper, FieldsItem> implements FieldsItemService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsServiceImpl.java
new file mode 100644
index 0000000..3bc4e0c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/FieldsServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.system.service.impl;
+
+import com.vincent.rsf.server.system.mapper.FieldsMapper;
+import com.vincent.rsf.server.system.entity.Fields;
+import com.vincent.rsf.server.system.service.FieldsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("fieldsService")
+public class FieldsServiceImpl extends ServiceImpl<FieldsMapper, Fields> implements FieldsService {
+
+}
diff --git a/rsf-server/src/main/resources/mapper/system/FieldsItemMapper.xml b/rsf-server/src/main/resources/mapper/system/FieldsItemMapper.xml
new file mode 100644
index 0000000..d1bab2a
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/system/FieldsItemMapper.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.system.mapper.FieldsItemMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/system/FieldsMapper.xml b/rsf-server/src/main/resources/mapper/system/FieldsMapper.xml
new file mode 100644
index 0000000..6c5e60f
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/system/FieldsMapper.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.system.mapper.FieldsMapper">
+
+</mapper>
--
Gitblit v1.9.1