Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

13 小时以前 f1f08a7174e53f375b341c9bd4be50f637db2c2e

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

@@ -2,10 +2,10 @@
import { useLocation, useNavigate } from 'react-router-dom';
import {
  List,
  DatagridConfigurable,
  SearchInput,
  TopToolbar,
  SelectColumnsButton,
  Toolbar,
  ColumnsButton,
  EditButton,
  FilterButton,
  CreateButton,
@@ -36,47 +36,120 @@
  Button,
  useRedirect,
  useUnselectAll,
  useRecordSelection,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import EmptyData from "../../components/EmptyData";
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
import BillStatusField from '../../components/BillStatusField';
import ConfirmButton from '../../components/ConfirmButton';
import PageDrawer from "../../components/PageDrawer";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import EditIcon from '@mui/icons-material/Edit';
import request from '@/utils/request';
import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
import { Box, Typography, Card, Stack, Drawer, LinearProgress } from '@mui/material';
import DictionarySelect from "../../components/DictionarySelect";
import StickyDataTable from "../../components/StickyDataTable";
import useTableLayout from '@/utils/useTableLayout';
import BillStatusField from '../../components/BillStatusField';
import MyCreateButton from "../../components/MyCreateButton";
import PageEditDrawer from "../../components/PageEditDrawer";
import ConfirmButton from '../../components/ConfirmButton';
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
import OutOrderCreate from "./OutOrderCreate";
import AddIcon from '@mui/icons-material/Add';
import OutOrderModal from "./OutOrderModal";
import OutStockWaveDialog from "./OutStockWaveDialog";
import AddTaskIcon from '@mui/icons-material/AddTask';
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";
import EditIcon from '@mui/icons-material/Edit';
import TaskIcon from '@mui/icons-material/Task';
import OutOrderPreview from "./OutOrderPreview";
import AddIcon from '@mui/icons-material/Add';
import OutStockPublic from "./OutStockPublic";
import OutOrderModal from "./OutOrderModal";
import request from '@/utils/request';

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 ListContent = ({ drawerVal, setDrawerVal, setWaveRule, setSelectIds, setSelect }) => {
  const { isLoading } = useListContext();
  const { boxMaxWidth, boxMaxHeight } = useTableLayout(drawerVal);

  const omittedFields = ['id', 'code', 'createTime', 'createBy$', 'memo', 'rleStatus$', 'logisNo', 'updateBy$', 'workQty', 'updateTime', 'type$'];

  return (
    <Box sx={{
      position: 'relative',
      maxHeight: boxMaxHeight,
      maxWidth: boxMaxWidth,
      overflowX: 'auto',
      overflowY: 'auto',
      '& .MuiTableCell-root': {
        whiteSpace: 'nowrap',
      },
      '& .css-1vooibu-MuiSvgIcon-root': {
        height: '.9em'
      },
      '& .RaDatagrid-row': {
        cursor: 'auto'
      },
      '& .column-name': {
      },
      '& .opt': {
        width: 420
      },
      '& .wkType': {
        width: 110
      },
      '& .status': {
        width: 90
      },
    }}>
      {isLoading && (
        <LinearProgress
          sx={{
            height: "2px",
            position: 'absolute',
            top: 0,
            left: 0,
            right: 0,
          }}
        />
      )}
      <StickyDataTable
        storeKey='outStock'
        bulkActionButtons={<PublicTaskButton setWaveRule={setWaveRule} setSelectIds={setSelectIds} />}
        rowClick={false}
        hiddenColumns={omittedFields}
      >
        <NumberField source="id" />
        <TextField source="code" label="table.field.outStock.code" />
        <TextField source="poCode" label="table.field.outStock.poCode" />
        <TextField source="type$" label="table.field.outStock.type" />
        <TextField cellClassName="wkType" source="wkType$" label="table.field.outStock.wkType" />
        <NumberField source="anfme" label="table.field.outStock.anfme" />
        <NumberField source="workQty" label="table.field.outStock.workQty" />
        <NumberField source="qty" label="table.field.outStock.qty" />
        <TextField source="logisNo" label="table.field.outStock.logisNo" />
        <TextField source="rleStatus$" label="table.field.outStock.rleStatus" sortable={false} />
        <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 />
        <TextField source="memo" label="common.field.memo" sortable={false} />

        {/* 银座新增 */}
        <TextField source="saleOrgName" label="销售组织" />
        <TextField source="saleUserName" label="销售员" />
        <DateField source="businessTime" label="出库日期" />
        <TextField source="customerId" label="客户编码" />
        <TextField source="customerName" label="客户" />
        <TextField source="stockOrgName" label="table.field.outStock.stockOrgName" />

        <BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
        <WrapperField cellClassName="opt" label="common.field.opt" >
          {/* <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} /> */}
          <EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
          <CancelButton />
          <CompleteButton />
          <PublicButton setDrawerVal={setDrawerVal} drawerVal={drawerVal} setSelect={setSelect} />
        </WrapperField>
      </StickyDataTable>
    </Box>
  )
}

const filters = [
  <SearchInput source="condition" alwaysOn />,
@@ -107,18 +180,36 @@
    dictTypeCode="sys_asn_exce_status"
    alwaysOn
  />,

]

const OutOrderList = (props) => {
  const translate = useTranslate();

  const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];
  const [createDialog, setCreateDialog] = useState(false);
  const [manualDialog, setManualDialog] = useState(false);
  const [drawerVal, setDrawerVal] = useState(false);
  const [waveRule, setWaveRule] = useState(false);
  const [selectIds, setSelectIds] = useState([]);
  const [preview, setPreview] = useState(false);
  const [modalType, setmodalType] = useState(0);
  const [select, setSelect] = useState(0);
  const translate = useTranslate();
  const refresh = useRefresh();
  const notify = useNotify();
  const billReload = useRef();
  const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || [];

  //获取波次规则
  const closeDialog = async (value) => {
    setWaveRule(false)
    const res = await request.post(`/outStock/generate/wave`, { ids: selectIds, waveRuleId: value.id });
    if (res?.data?.code === 200) {
      notify(res.data.msg);
    } else {
      notify(res.data.msg);
    }
    refresh()
  }

  return (
    <Box display="flex">
      <List
@@ -129,7 +220,6 @@
            theme.transitions.create(['all'], {
              duration: theme.transitions.duration.enteringScreen,
            }),
          marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
        }}
        title={"menu.outStock"}
        empty={false}
@@ -141,45 +231,19 @@
            <FilterButton />
            <CreateByOrderButton setCreateDialog={setCreateDialog} />
            <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
            <SelectColumnsButton preferenceKey='outStock' />
            <ImportButton value={'asnOrderItem'} />
            {/* <MyExportButton /> */}
            <ColumnsButton storeKey='outStock' />
            <ImportButton value={'outStockItem'} />
          </TopToolbar>
        )}
        perPage={DEFAULT_PAGE_SIZE}
      >
        <StyledDatagrid
          sx={{ width: '100%' }}
          preferenceKey='outStock'
          bulkActionButtons={
            <PublicTaskButton />}
          rowClick={false}
          expandSingle={true}
          omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
        >
          <NumberField source="id" />
          <TextField source="code" label="table.field.outStock.code" />
          <TextField source="poCode" label="table.field.outStock.poCode" />
          <NumberField source="poId" label="table.field.outStock.poId" />
          <TextField source="type$" label="table.field.outStock.type" />
          <TextField cellClassName="wkType" source="wkType$" label="table.field.outStock.wkType" />
          <NumberField source="anfme" label="table.field.outStock.anfme" />
          <NumberField source="workQty" label="table.field.outStock.workQty" />
          <NumberField source="qty" label="table.field.outStock.qty" />
          <TextField source="logisNo" label="table.field.outStock.logisNo" />
          <TextField source="rleStatus$" label="table.field.outStock.rleStatus" sortable={false} />
          <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 />
          <BillStatusField cellClassName="status" source="exceStatus" label="table.field.outStock.exceStatus" />
          <TextField source="memo" label="common.field.memo" sortable={false} />
          <WrapperField cellClassName="opt" label="common.field.opt" >
            <MyButton setCreateDialog={setManualDialog} setmodalType={setmodalType} />
            <EditButton label="toolbar.detail" icon={(<DetailsIcon />)}></EditButton>
            <CancelButton />
          </WrapperField>
        </StyledDatagrid>
        <ListContent
          drawerVal={drawerVal}
          setDrawerVal={setDrawerVal}
          setWaveRule={setWaveRule}
          setSelectIds={setSelectIds}
          setSelect={setSelect}
        />
      </List>
      {/* <OutOrderCreate
        open={manualDialog}
@@ -194,36 +258,34 @@
      <OutOrderModal
        open={createDialog}
        setOpen={setCreateDialog}
        preview={preview}
        setPreview={setPreview}
      />
      <PageDrawer
        title='AsnOrder Detail'
      <OutStockWaveDialog open={waveRule} setOpen={setWaveRule} onClose={closeDialog} />
      <OutOrderPreview open={preview} setOpen={setPreview} />
      <PageEditDrawer
        title={"toolbar.publicWorking"}
        drawerVal={drawerVal}
        setDrawerVal={setDrawerVal}
      />
      >
        <OutStockPublic record={select} open={drawerVal} setOpen={setDrawerVal} />
      </PageEditDrawer>
    </Box >
  )
}
export default OutOrderList;


const PublicTaskButton = () => {
const PublicTaskButton = ({ setWaveRule, setSelectIds }) => {
  const record = useRecordContext();
  const { selectedIds, onUnselectItems } = useListContext();
  const notify = useNotify();
  const refresh = useRefresh();
  const redirect = useRedirect();

  const pubClick = async (event) => {
    event.stopPropagation();
  const pubClick = async () => {
    onUnselectItems();
    const res = await request.post(`/outStock/generate/wave`, { ids: selectedIds });
    if (res?.data?.code === 200) {
      notify(res.data.msg);
      redirect("/wave")
    } else {
      notify(res.data.msg);
    }
    refresh();
    setWaveRule(true);
    setSelectIds(selectedIds)
  }

  return (
@@ -231,7 +293,31 @@
      onClick={pubClick}
      label={"toolbar.createWave"}
      startIcon={<PublicIcon />}
    />);
    />
  );
}

//完成单据
const CompleteButton = () => {
  const record = useRecordContext();
  const notify = useNotify();
  const refresh = useRefresh();
  const requestComplete = async () => {
    const { data: { code, data, msg } } = await request.get(`/outStock/complete/${record.id}`);
    if (code === 200) {
      notify(msg);
      refresh()
    } else {
      notify(msg);
    }
  }

  return (
    // record.exceStatus === 1 && (record.anfme === record.qty ? <Button onClick={requestComplete} label={"toolbar.complete"} color="secondary">
    //   <TaskIcon />
    // </Button> : )
    record.exceStatus != 15 ? <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} /> : <></>
  )
}

const MyButton = ({ setCreateDialog, setmodalType }) => {
@@ -258,7 +344,6 @@
  const record = useRecordContext();
  const notify = useNotify();
  const refresh = useRefresh();

  const createByOrder = async (event) => {
    event.stopPropagation();
    setCreateDialog(true);
@@ -284,6 +369,21 @@
  }

  return (
    record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} /> : <></>
    record?.exceStatus == 10 ? <ConfirmButton label={"toolbar.cancel"} startIcon={<CancelOutlinedIcon />} onConfirm={cancelOrder} size={"small"} /> : <></>
  )
}

//下发执行
const PublicButton = ({ setDrawerVal, setSelect }) => {
  const record = useRecordContext();
  const refresh = useRefresh();
  const taskEvent = () => {
    setDrawerVal(true)
    setSelect(record)
    refresh();
  }

  return (
    record.workQty < record.anfme ? <Button label={"toolbar.publicWorking"} startIcon={<AddTaskIcon />} onClick={taskEvent} size={"small"} /> : <></>
  )
}