#修改优化 1. DO单明细编码优化 2. DO单明细新增优化 3. 出库单新增单据增加新单据功能

skyouc

6 天以前 4496b9019ba423dd1c51c719bcc0a5938d90fff9

#修改优化
 1. DO单明细编码优化
 2. DO单明细新增优化
 3. 出库单新增单据增加新单据功能

 rsf-admin/src/i18n/en.js

@@ -939,7 +939,7 @@
        quality: "quality",
        complete: "complete",
        close: "close",
        asnCreate: "asnCreate",
        asnCreate: "Create By Order",
        createTask: "createTask",
        recover: "recover",
        order: 'Orders',

 rsf-admin/src/i18n/zh.js

@@ -988,7 +988,7 @@
        quality: "质检",
        complete: "完成",
        close: "关闭",
        asnCreate: "通过ASN创建",
        asnCreate: "通过单据创建",
        createTask: "生成任务",
        recover: "继续收货",
    },

 rsf-admin/src/page/orders/delivery/DeliveryCreate.jsx

@@ -124,12 +124,10 @@
                                    <NumberInput
                                        label="table.field.delivery.qty"
                                        source="qty"
                                        validate={required()}
                                    />
                                    <NumberInput
                                        label="table.field.delivery.workQty"
                                        source="workQty"
                                        validate={required()}
                                    />
                                    <TextInput
                                        label="table.field.delivery.platCode"

 rsf-admin/src/page/orders/delivery/DeliveryEdit.jsx

@@ -111,12 +111,10 @@
                                <NumberInput
                                    label="table.field.delivery.qty"
                                    source="qty"
                                    validate={required()}
                                />
                                <NumberInput
                                    label="table.field.delivery.workQty"
                                    source="workQty"
                                    validate={required()}
                                />
                                <TextInput
                                    label="table.field.delivery.platCode"

 rsf-admin/src/page/orders/delivery/DeliveryItemCreate.jsx

@@ -17,6 +17,7 @@
    useNotify,
    Form,
    useCreateController,
    ReferenceField,
} from 'react-admin';
import {
    Dialog,
@@ -26,6 +27,7 @@
    Stack,
    Grid,
    Box,
    TextField,
} from '@mui/material';
import DialogCloseButton from "../../components/DialogCloseButton";
import StatusSelectInput from "../../components/StatusSelectInput";
@@ -55,6 +57,7 @@
    return (
        <>
            <CreateBase
                resource="deliveryItem"
                record={{}}
                transform={(data) => {
                    return data;
@@ -84,99 +87,70 @@
                        </DialogTitle>
                        <DialogContent sx={{ mt: 2 }}>
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1} sx={{display : "none"}}>
                                    <NumberInput 
                                <Grid item xs={6} display="flex" gap={1} sx={{ display: "none" }}>
                                    <NumberInput
                                        label="table.field.deliveryItem.deliveryId"
                                        source="deliveryId"
                                        defaultValue={record?.id}
                                        readOnly
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                <Grid item xs={12} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.deliveryItem.platItemId"
                                        source="platItemId"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.deliveryItem.matnrCode"
                                        source="matnrCode"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.deliveryItem.matnrName"
                                        source="matnrName"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.deliveryItem.fieldsIndex"
                                        source="fieldsIndex"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                <Grid item xs={12} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.deliveryItem.unit"
                                        source="unit"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.deliveryItem.anfme"
                                        source="anfme"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.deliveryItem.qty"
                                        source="qty"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.deliveryItem.nromQty"
                                        source="nromQty"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                <Grid item xs={12} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.deliveryItem.printQty"
                                        source="printQty"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.deliveryItem.splrName"
                                        source="splrName"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                    <ReferenceInput source="splrName" reference="companys" label="table.field.deliveryItem.splrName" queryOptions={{ type: 'supplier' }}>
                                        <AutocompleteInput
                                            label="table.field.deliveryItem.splrName"
                                            optionText="name"
                                            source="splrCode"
                                        />
                                    </ReferenceInput>
                                    {/* <TextInput
                                        label="table.field.deliveryItem.splrCode"
                                        source="splrCode"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    /> */}
                                    <TextInput
                                        label="table.field.deliveryItem.splrBatch"
                                        source="splrBatch"
                                        parse={v => v}
                                    />
                                </Grid>

                                <Grid item xs={6} display="flex" gap={1}>
                                    <StatusSelectInput />
                                </Grid>

 rsf-admin/src/page/orders/delivery/DeliveryItemList.jsx

@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import { useNavigate } from 'react-router-dom';
import { useLocation, useNavigate } from 'react-router-dom';
import {
    List,
    DatagridConfigurable,
@@ -97,6 +97,7 @@
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);
    const [editDialog, setEditDialog] = useState(false);
    const location = useLocation();
    const [select, setSelect] = useState({});
    const { data: dicts, isPending, error } = useGetOne('delivery', { id: doId });
    return (
@@ -112,7 +113,7 @@
                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                }}
                title={"menu.deliveryItem"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                empty={false}
                filters={filters}
                filter={{deliveryId: doId}}
                sort={{ field: "create_time", order: "desc" }}
@@ -158,7 +159,7 @@
                    <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">
                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} redirect={location.pathname + '/' + doId} />
                    </WrapperField>
                </StyledDatagrid>
            </List>

 rsf-admin/src/page/orders/outStock/AsnOrderModal.jsx

File was deleted

 rsf-admin/src/page/orders/outStock/AsnOrderPanel.jsx

File was deleted

 rsf-admin/src/page/orders/outStock/AsnWareModal.jsx

File was deleted

 rsf-admin/src/page/orders/outStock/OutOrderItemCreate.jsx

@@ -53,7 +53,7 @@
    return (
        <>
            <CreateBase
                resource="asnOrderItem"
                resource="outStockItem"
                record={{}}
                transform={(data) => {
                    return data;
@@ -85,105 +85,99 @@
                            <Grid>
                                <Grid item xs={6} display="flex" gap={2}>
                                    <NumberInput
                                        label="table.field.asnOrderItem.asnId"
                                        label="table.field.outStockItem.asnId"
                                        source="asnId"
                                        readOnly
                                        hidden
                                        defaultValue={record?.id}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.asnCode"
                                        label="table.field.outStockItem.asnCode"
                                        source="asnCode"
                                        readOnly
                                        defaultValue={record?.code}
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={2}>
                                    <TextInput
                                        label="table.field.asnOrderItem.poDetlId"
                                        label="table.field.outStockItem.poDetlId"
                                        source="poDetlId"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.poDetlCode"
                                        source="poDetlCode"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.matnrId"
                                        source="matnrId"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.asnOrderItem.maktx"
                                        label="table.field.outStockItem.matnrId"
                                        source="matnrId"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.outStockItem.maktx"
                                        source="maktx"
                                        parse={v => v}
                                    />
                                    <NumberInput
                                        label="table.field.asnOrderItem.anfme"
                                        label="table.field.outStockItem.anfme"
                                        source="anfme"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.asnOrderItem.stockUnit"
                                        label="table.field.outStockItem.stockUnit"
                                        source="stockUnit"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.asnOrderItem.purQty"
                                        label="table.field.outStockItem.purQty"
                                        source="purQty"
                                        validate={required()}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.purUnit"
                                        label="table.field.outStockItem.purUnit"
                                        source="purUnit"
                                        parse={v => v}
                                    />
                                    <NumberInput
                                        label="table.field.asnOrderItem.qty"
                                        source="qty"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.outStockItem.qty"
                                        source="qty"
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.splrCode"
                                        label="table.field.outStockItem.splrCode"
                                        source="splrCode"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.splrName"
                                        label="table.field.outStockItem.splrName"
                                        source="splrName"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.qrcode"
                                        source="qrcode"
                                        parse={v => v}
                                    />

                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.asnOrderItem.barcode"
                                        label="table.field.outStockItem.qrcode"
                                        source="qrcode"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.outStockItem.barcode"
                                        source="barcode"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.packName"
                                        label="table.field.outStockItem.packName"
                                        source="packName"
                                        parse={v => v}
                                    />
                                </Grid>

                                <Grid item xs={6} display="flex" gap={1}>
                                <Grid item xs={4} display="flex" gap={1}>
                                    <StatusSelectInput />
                                </Grid>
                                <Grid item xs={12} display="flex" gap={1}>
                                    <Stack direction="column" spacing={1} width={'100%'}>
                                <Grid item xs={4} display="flex" gap={1}>
                                    <Stack direction="column" spacing={1}>
                                        <MemoInput />
                                    </Stack>
                                </Grid>

 rsf-admin/src/page/orders/outStock/OutOrderItemEdit.jsx

@@ -52,7 +52,7 @@
            setOpen(false);
        }
    };
    const { data, isPending, } = useGetOne('asnOrderItem', { id: record?.id });
    const { data, isPending, } = useGetOne('outStockItem', { id: record?.id });
    if (data == null || data == undefined) { return }

    return (
@@ -79,7 +79,7 @@
            <DialogContent sx={{ mt: 2 }}>
                <EditBase
                    id={record?.id}
                    resource="asnOrderItem"
                    resource="outStockItem"
                    mutationMode={EDIT_MODE}
                    actions={<CustomerTopToolBar />}
                >
@@ -93,83 +93,83 @@
                            <Grid item xs={24} md={14}>
                                <Stack direction='row' gap={2}>
                                    <NumberInput
                                        label="table.field.asnOrderItem.asnId"
                                        label="table.field.outStockItem.asnId"
                                        source="asnId"
                                        readOnly
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.asnCode"
                                        label="table.field.outStockItem.asnCode"
                                        source="asnCode"
                                        readOnly
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.poDetlId"
                                        label="table.field.outStockItem.poDetlId"
                                        source="poDetlId"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.poDetlCode"
                                        label="table.field.outStockItem.poDetlCode"
                                        source="poDetlCode"
                                        parse={v => v}
                                    />
                                </Stack>
                                <Stack direction='row' gap={2}>
                                    <TextInput
                                        label="table.field.asnOrderItem.matnrId"
                                        label="table.field.outStockItem.matnrId"
                                        source="matnrId"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.maktx"
                                        label="table.field.outStockItem.maktx"
                                        source="maktx"
                                        parse={v => v}
                                    />
                                    <NumberInput
                                        label="table.field.asnOrderItem.anfme"
                                        label="table.field.outStockItem.anfme"
                                        source="anfme"
                                        validate={required()}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.stockUnit"
                                        label="table.field.outStockItem.stockUnit"
                                        source="stockUnit"
                                        parse={v => v}
                                    />
                                </Stack>
                                <Stack direction='row' gap={2}>
                                    <NumberInput
                                        label="table.field.asnOrderItem.purQty"
                                        label="table.field.outStockItem.purQty"
                                        source="purQty"
                                        validate={required()}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.purUnit"
                                        label="table.field.outStockItem.purUnit"
                                        source="purUnit"
                                        parse={v => v}
                                    />
                                    <NumberInput
                                        label="table.field.asnOrderItem.qty"
                                        label="table.field.outStockItem.qty"
                                        source="qty"
                                        readOnly
                                    />
                                    <ReferenceInput source="splrName" label="table.field.asnOrderItem.splrName" reference="companys" filter={{type: 'supplier'}}>
                                        <AutocompleteInput optionText="name" label="table.field.asnOrderItem.splrName" />
                                    <ReferenceInput source="splrName" label="table.field.outStockItem.splrName" reference="companys" filter={{type: 'supplier'}}>
                                        <AutocompleteInput optionText="name" label="table.field.outStockItem.splrName" />
                                    </ReferenceInput>
                                </Stack>
                                <Stack direction='row' gap={2}>
                                    <TextInput
                                        label="table.field.asnOrderItem.qrcode"
                                        label="table.field.outStockItem.qrcode"
                                        source="qrcode"
                                        parse={v => v}
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.barcode"
                                        label="table.field.outStockItem.barcode"
                                        source="trackCode"
                                        parse={v => v}
                                        readOnly
                                    />
                                    <TextInput
                                        label="table.field.asnOrderItem.packName"
                                        label="table.field.outStockItem.packName"
                                        source="packName"
                                        parse={v => v}
                                    />

 rsf-admin/src/page/orders/outStock/OutOrderList.jsx

@@ -39,7 +39,6 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import AsnOrderModal from "./AsnOrderModal";
import EmptyData from "../../components/EmptyData";
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
@@ -54,6 +53,9 @@
import DetailsIcon from '@mui/icons-material/Details';
import CancelIcon from '@mui/icons-material/Cancel';
import OutOrderCreate from "./OutOrderCreate";
import AddIcon from '@mui/icons-material/Add';
import OutOrderModal from "./OutOrderModal";

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
  '& .css-1vooibu-MuiSvgIcon-root': {
    height: '.9em'
@@ -136,6 +138,7 @@
        actions={(
          <TopToolbar>
            <FilterButton />
            <CreateByOrderButton setCreateDialog={setCreateDialog}/>
            <MyCreateButton onClick={() => { setManualDialog(true) }} />
            <SelectColumnsButton preferenceKey='outStock' />
            <ImportButton value={'asnOrderItem'} />
@@ -175,17 +178,15 @@
          <TextField source="memo" label="common.field.memo" sortable={false} />
          <WrapperField cellClassName="opt" label="common.field.opt" >
            <EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
            <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} />
            {/* <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} /> */}
            <CancelButton></CancelButton>
          </WrapperField>
        </StyledDatagrid>
      </List>
      <OutOrderCreate open={manualDialog} setOpen={setManualDialog} />
      <AsnOrderModal
      <OutOrderModal
        open={createDialog}
        setOpen={setCreateDialog}
        asnId={modalType}
        billReload={billReload}
      />
      <PageDrawer
        title='AsnOrder Detail'
@@ -205,7 +206,6 @@
    const id = record.id;
    setmodalType(id);
    setCreateDialog(true);

  };
  return (
    <Button
@@ -219,14 +219,29 @@
  )
}

const CreateByOrderButton = ({setCreateDialog}) => {
  const record = useRecordContext();
  const notify = useNotify();
  const refresh = useRefresh();

  const createByOrder = async (event) => {
    event.stopPropagation();
    setCreateDialog(true);
  }

  return (
    <Button onClick={createByOrder} label={'toolbar.asnCreate'}> <AddIcon /> </Button>
  )

}

const CancelButton = () => {
  const record = useRecordContext();
  const notify = useNotify();
  const refresh = useRefresh();
  console.log(record);
  

  const cancelOrder = async () => {
    console.log(event);
    const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
    if (code === 200) {
      notify(msg);

 rsf-admin/src/page/orders/outStock/OutOrderModal.jsx

New file
@@ -0,0 +1,167 @@
import { Dialog, DialogActions, DialogContent, DialogTitle, Box } from "@mui/material";
import React, { useState, useRef, useEffect, useMemo } from "react";
import {
    List,
    DatagridConfigurable,
    SearchInput,
    TopToolbar,
    Button,
    SelectColumnsButton,
    EditButton,
    FilterButton,
    CreateButton,
    ExportButton,
    BulkDeleteButton,
    WrapperField,
    Toolbar,
    useRecordContext,
    useTranslate,
    useNotify,
    useListContext,
    FunctionField,
    TextField,
    NumberField,
    DateField,
    BooleanField,
    ReferenceField,
    TextInput,
    DateTimeInput,
    DateInput,
    SelectInput,
    NumberInput,
    ReferenceInput,
    ReferenceArrayInput,
    AutocompleteInput,
    DeleteButton,
} from 'react-admin';
import DialogCloseButton from "../../components/DialogCloseButton";
import { styled } from '@mui/material/styles';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
        height: '.9em'
    },
    '& .RaDatagrid-row': {
        cursor: 'auto'
    },
    '& .column-name': {
    },
    '& .opt': {
        width: 220
    },
    '& .wkType': {
        width: 110
    },
    '& .status': {
        width: 90
    },
}));
const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" />,
    <DateInput label='common.time.before' source="timeEnd" />,
    <TextInput source="code" label="table.field.delivery.code" />,
    <TextInput source="platId" label="table.field.delivery.platId" />,
    <TextInput source="type" label="table.field.delivery.type" />,
    <TextInput source="wkType" label="table.field.delivery.wkType" />,
    <TextInput source="source" label="table.field.delivery.source" />,
    <SelectInput
        label="common.field.status"
        source="status"
        choices={[
            { id: '1', name: 'common.enums.statusTrue' },
            { id: '0', name: 'common.enums.statusFalse' },
        ]}
        resettable
    />,
]

const OutOrderModal = (props) => {
    const { open, setOpen, record } = props;
    const translate = useTranslate();
    const [drawerVal, setDrawerVal] = useState(false);

    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
            setOpen(false);
        }
    };
    return (
        <Dialog
            open={open}
            onClose={handleClose}
            aria-labelledby="form-dialog-title"
            aria-hidden
            fullWidth
            disableRestoreFocus
            maxWidth="lg"
        >
            <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>
                <List
                    resource="deliveryItem"
                    storeKey='selectDelivery'
                    sx={{
                        flexGrow: 1,
                        transition: (theme) =>
                            theme.transitions.create(['all'], {
                                duration: theme.transitions.duration.enteringScreen,
                            }),
                        marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                    }}
                    title={"menu.delivery"}
                    empty={false}
                    sort={{ field: "create_time", order: "desc" }}
                    actions={(
                        <TopToolbar>
                            <></>
                        </TopToolbar>
                    )}
                    perPage={DEFAULT_PAGE_SIZE}
                >
                    <StyledDatagrid
                        preferenceKey='deliveryItem'
                        bulkActionButtons={() => <></>}
                        rowClick={(id, resource, record) => false}
                        expand={false}
                        expandSingle={true}
                        omit={['id', 'createTime', 'createBy', 'memo', 'workQty', 'startTime', 'endTime', 'updateBy', 'createTime']}
                    >
                        <NumberField source="id" />
                        <TextField source="matnrCode" label="table.field.deliveryItem.matnrCode" />
                        <TextField source="matnrName" label="table.field.deliveryItem.matnrName" />
                        <TextField source="unit" label="table.field.deliveryItem.unit" />
                        <NumberField source="anfme" label="table.field.deliveryItem.anfme" />
                        <TextField source="splrName" label="table.field.deliveryItem.splrName" />
                        <TextField source="splrBatch" label="table.field.deliveryItem.splrBatch" />
                        <TextField source="updateBy$" label="common.field.updateBy" />
                        <DateField source="updateTime" label="common.field.updateTime" showTime />
                        <TextField source="createBy$" label="common.field.createBy" />
                        <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} />
                    </StyledDatagrid>
                </List>
            </DialogContent>
            <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
                {/* <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }}  >
                    <Button disabled={disabled} onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
                        {translate('toolbar.confirm')}
                    </Button>
                </Toolbar> */}
            </DialogActions>
        </Dialog>
    )
}

export default OutOrderModal;

 rsf-admin/src/page/orders/outStock/PrintModal.jsx

File was deleted

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java

@@ -10,6 +10,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Delivery;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.DeliveryService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -28,7 +29,6 @@

    @Autowired
    private DeliveryService deliveryService;


    @PreAuthorize("hasAuthority('manager:delivery:list')")
    @PostMapping("/delivery/page")
@@ -81,6 +81,13 @@
    public R update(@RequestBody Delivery delivery) {
        delivery.setUpdateBy(getLoginUserId());
        delivery.setUpdateTime(new Date());
        if (Objects.isNull(delivery.getCode()) || StringUtils.isBlank(delivery.getCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_DELIVERY_RULE_CODE, delivery);
            if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
                return R.error("编码规则错误：编码「SYS_DELIVERY_RULE_CODE」是未设置成功！！");
            }
            delivery.setCode(ruleCode);
        }
        if (!deliveryService.updateById(delivery)) {
            return R.error("Update Fail");
        }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java

@@ -9,9 +9,12 @@
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.Companys;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.DeliveryItemService;
import com.vincent.rsf.server.system.controller.BaseController;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +27,10 @@

    @Autowired
    private DeliveryItemService deliveryItemService;


    @Autowired
    private CompanysService companysService;

    @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
    @PostMapping("/deliveryItem/page")
@@ -59,6 +66,10 @@
        deliveryItem.setCreateTime(new Date());
        deliveryItem.setUpdateBy(getLoginUserId());
        deliveryItem.setUpdateTime(new Date());
        if (StringUtils.isNotBlank(deliveryItem.getSplrName())) {
            Companys companys = companysService.getById(deliveryItem.getSplrName());
            deliveryItem.setSplrName(companys.getName()).setSplrCode(companys.getCode());
        }
        if (!deliveryItemService.save(deliveryItem)) {
            return R.error("Save Fail");
        }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java

@@ -17,8 +17,6 @@
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeliveryItem.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;

import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -22,6 +24,7 @@
import java.util.Date;

@Data
@Accessors(chain = true)
@TableName("man_delivery_item")
public class DeliveryItem implements Serializable {