From 13d89666b40e5b878e4056d1d832fe265d64efce Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 05 八月 2025 15:59:02 +0800 Subject: [PATCH] 库存调整单功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/ReviseLog.java | 7 rsf-admin/src/page/reviseLogItem/ReviseLogItemList.jsx | 176 ++++++++++++++ rsf-admin/src/page/reviseLogItem/ReviseLogItemPanel.jsx | 129 ++++++++++ rsf-admin/src/page/reviseLogItem/ReviseLogItemCreate.jsx | 197 ++++++++++++++++ rsf-admin/src/page/reviseLogItem/ReviseLogItemEdit.jsx | 169 ++++++++++++++ rsf-admin/src/page/reviseLogItem/index.jsx | 18 + rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java | 5 7 files changed, 696 insertions(+), 5 deletions(-) diff --git a/rsf-admin/src/page/reviseLogItem/ReviseLogItemCreate.jsx b/rsf-admin/src/page/reviseLogItem/ReviseLogItemCreate.jsx new file mode 100644 index 0000000..7a446f5 --- /dev/null +++ b/rsf-admin/src/page/reviseLogItem/ReviseLogItemCreate.jsx @@ -0,0 +1,197 @@ +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 ReviseLogItemCreate = (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}> + <NumberInput + label="table.field.reviseLogItem.reviseLogId" + source="reviseLogId" + autoFocus + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.reviseLogItem.locId" + source="locId" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.locCode" + source="locCode" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.reviseLogItem.matnrId" + source="matnrId" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.maktx" + source="maktx" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.matnrCode" + source="matnrCode" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.unit" + source="unit" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.reviseLogItem.anfme" + source="anfme" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.reviseLogItem.reviseQty" + source="reviseQty" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.batch" + source="batch" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.spec" + source="spec" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.model" + source="model" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.reviseLogItem.fieldsIndex" + source="fieldsIndex" + 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 ReviseLogItemCreate; diff --git a/rsf-admin/src/page/reviseLogItem/ReviseLogItemEdit.jsx b/rsf-admin/src/page/reviseLogItem/ReviseLogItemEdit.jsx new file mode 100644 index 0000000..9fdcba3 --- /dev/null +++ b/rsf-admin/src/page/reviseLogItem/ReviseLogItemEdit.jsx @@ -0,0 +1,169 @@ +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 ReviseLogItemEdit = () => { + 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}> + <NumberInput + label="table.field.reviseLogItem.reviseLogId" + source="reviseLogId" + autoFocus + /> + </Stack> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.reviseLogItem.locId" + source="locId" + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.locCode" + source="locCode" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.reviseLogItem.matnrId" + source="matnrId" + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.maktx" + source="maktx" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.matnrCode" + source="matnrCode" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.unit" + source="unit" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.reviseLogItem.anfme" + source="anfme" + /> + </Stack> + <Stack direction='row' gap={2}> + <NumberInput + label="table.field.reviseLogItem.reviseQty" + source="reviseQty" + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.batch" + source="batch" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.spec" + source="spec" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.model" + source="model" + parse={v => v} + /> + </Stack> + <Stack direction='row' gap={2}> + <TextInput + label="table.field.reviseLogItem.fieldsIndex" + source="fieldsIndex" + 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 ReviseLogItemEdit; diff --git a/rsf-admin/src/page/reviseLogItem/ReviseLogItemList.jsx b/rsf-admin/src/page/reviseLogItem/ReviseLogItemList.jsx new file mode 100644 index 0000000..1870352 --- /dev/null +++ b/rsf-admin/src/page/reviseLogItem/ReviseLogItemList.jsx @@ -0,0 +1,176 @@ +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 ReviseLogItemCreate from "./ReviseLogItemCreate"; +import ReviseLogItemPanel from "./ReviseLogItemPanel"; +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 />, + + <NumberInput source="reviseLogId" label="table.field.reviseLogItem.reviseLogId" />, + <NumberInput source="locId" label="table.field.reviseLogItem.locId" />, + <TextInput source="locCode" label="table.field.reviseLogItem.locCode" />, + <NumberInput source="matnrId" label="table.field.reviseLogItem.matnrId" />, + <TextInput source="maktx" label="table.field.reviseLogItem.maktx" />, + <TextInput source="matnrCode" label="table.field.reviseLogItem.matnrCode" />, + <TextInput source="unit" label="table.field.reviseLogItem.unit" />, + <NumberInput source="anfme" label="table.field.reviseLogItem.anfme" />, + <NumberInput source="reviseQty" label="table.field.reviseLogItem.reviseQty" />, + <TextInput source="batch" label="table.field.reviseLogItem.batch" />, + <TextInput source="spec" label="table.field.reviseLogItem.spec" />, + <TextInput source="model" label="table.field.reviseLogItem.model" />, + <TextInput source="fieldsIndex" label="table.field.reviseLogItem.fieldsIndex" />, + + <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 ReviseLogItemList = () => { + 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.reviseLogItem"} + empty={<EmptyData onClick={() => { setCreateDialog(true) }} />} + filters={filters} + sort={{ field: "create_time", order: "desc" }} + actions={( + <TopToolbar> + <FilterButton /> + <MyCreateButton onClick={() => { setCreateDialog(true) }} /> + <SelectColumnsButton preferenceKey='reviseLogItem' /> + <MyExportButton /> + </TopToolbar> + )} + perPage={DEFAULT_PAGE_SIZE} + > + <StyledDatagrid + preferenceKey='reviseLogItem' + bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />} + rowClick={(id, resource, record) => false} + expand={() => <ReviseLogItemPanel />} + expandSingle={true} + omit={['id', 'createTime', 'createBy', 'memo']} + > + <NumberField source="id" /> + <NumberField source="reviseLogId" label="table.field.reviseLogItem.reviseLogId" /> + <NumberField source="locId" label="table.field.reviseLogItem.locId" /> + <TextField source="locCode" label="table.field.reviseLogItem.locCode" /> + <NumberField source="matnrId" label="table.field.reviseLogItem.matnrId" /> + <TextField source="maktx" label="table.field.reviseLogItem.maktx" /> + <TextField source="matnrCode" label="table.field.reviseLogItem.matnrCode" /> + <TextField source="unit" label="table.field.reviseLogItem.unit" /> + <NumberField source="anfme" label="table.field.reviseLogItem.anfme" /> + <NumberField source="reviseQty" label="table.field.reviseLogItem.reviseQty" /> + <TextField source="batch" label="table.field.reviseLogItem.batch" /> + <TextField source="spec" label="table.field.reviseLogItem.spec" /> + <TextField source="model" label="table.field.reviseLogItem.model" /> + <TextField source="fieldsIndex" label="table.field.reviseLogItem.fieldsIndex" /> + + <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> + <ReviseLogItemCreate + open={createDialog} + setOpen={setCreateDialog} + /> + <PageDrawer + title='ReviseLogItem Detail' + drawerVal={drawerVal} + setDrawerVal={setDrawerVal} + > + </PageDrawer> + </Box> + ) +} + +export default ReviseLogItemList; diff --git a/rsf-admin/src/page/reviseLogItem/ReviseLogItemPanel.jsx b/rsf-admin/src/page/reviseLogItem/ReviseLogItemPanel.jsx new file mode 100644 index 0000000..e290636 --- /dev/null +++ b/rsf-admin/src/page/reviseLogItem/ReviseLogItemPanel.jsx @@ -0,0 +1,129 @@ +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 ReviseLogItemPanel = () => { + 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.reviseLogItem.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.reviseLogItem.reviseLogId" + property={record.reviseLogId} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.locId" + property={record.locId} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.locCode" + property={record.locCode} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.matnrId" + property={record.matnrId} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.maktx" + property={record.maktx} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.matnrCode" + property={record.matnrCode} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.unit" + property={record.unit} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.anfme" + property={record.anfme} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.reviseQty" + property={record.reviseQty} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.batch" + property={record.batch} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.spec" + property={record.spec} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.model" + property={record.model} + /> + </Grid> + <Grid item xs={6}> + <PanelTypography + title="table.field.reviseLogItem.fieldsIndex" + property={record.fieldsIndex} + /> + </Grid> + + </Grid> + </CardContent> + </Card > + </> + ); +}; + +export default ReviseLogItemPanel; diff --git a/rsf-admin/src/page/reviseLogItem/index.jsx b/rsf-admin/src/page/reviseLogItem/index.jsx new file mode 100644 index 0000000..817f52f --- /dev/null +++ b/rsf-admin/src/page/reviseLogItem/index.jsx @@ -0,0 +1,18 @@ +import React, { useState, useRef, useEffect, useMemo } from "react"; +import { + ListGuesser, + EditGuesser, + ShowGuesser, +} from "react-admin"; + +import ReviseLogItemList from "./ReviseLogItemList"; +import ReviseLogItemEdit from "./ReviseLogItemEdit"; + +export default { + list: ReviseLogItemList, + edit: ReviseLogItemEdit, + show: ShowGuesser, + recordRepresentation: (record) => { + return `${record.id}` + } +}; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/ReviseLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/ReviseLog.java index a2e0647..0170594 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/ReviseLog.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/ReviseLog.java @@ -1,6 +1,7 @@ package com.vincent.rsf.server.manager.entity; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; + import java.text.SimpleDateFormat; import java.util.Date; @@ -9,10 +10,7 @@ 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; @@ -88,6 +86,7 @@ /** * 鎺� */ + @TableField("`row`") @ApiModelProperty(value= "鎺�") private Integer row; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java index d8d00e7..3b03850 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; @@ -31,6 +32,7 @@ * @return */ @Override + @Transactional(rollbackFor = Exception.class) public List<ReviseLog> reviseLoc(ReviseLogParams revise, Long loginUserId) { LocRevise locRevise = locReviseService.getById(revise.getReviseId()); if (Objects.isNull(locRevise)) { @@ -45,12 +47,13 @@ BeanUtils.copyProperties(item, reviseLog); reviseLog.setAreaId(locRevise.getAreaId()) .setReviseId(locRevise.getId()) + .setCreateBy(loginUserId) + .setUpdateBy(loginUserId) .setReviseCode(locRevise.getCode()) ; if (!reviseLogService.save(reviseLog)) { throw new RuntimeException("璋冩暣鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�"); } }); - return items; } } -- Gitblit v1.9.1