1. 波次删除判断是否有子任务列表 2. 任务明细添加字段：执行数量，完成数量， 源单据号，源单据ID

skyouc

2025-04-30 d2cb36959b65ece32cec7e2db4d6764f5c788b1d

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

@@ -51,10 +51,12 @@
import DictionarySelect from "../../components/DictionarySelect";
import ImportButton from "../../components/ImportButton";
import DetailsIcon from '@mui/icons-material/Details';
import CancelIcon from '@mui/icons-material/Cancel';
import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
import OutOrderCreate from "./OutOrderCreate";
import AddIcon from '@mui/icons-material/Add';
import OutOrderModal from "./OutOrderModal";
import PublicIcon from '@mui/icons-material/Public';
import SelectMatnrModal from "./SelectMatnrModal";

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
  '& .css-1vooibu-MuiSvgIcon-root': {
@@ -121,7 +123,6 @@
    <Box display="flex">
      <List
        resource="outStock"
        storeKey='outStock'
        sx={{
          flexGrow: 1,
          transition: (theme) =>
@@ -138,11 +139,11 @@
        actions={(
          <TopToolbar>
            <FilterButton />
            <CreateByOrderButton setCreateDialog={setCreateDialog}/>
            <MyCreateButton onClick={() => { setManualDialog(true) }} />
            <CreateByOrderButton setCreateDialog={setCreateDialog} />
            <MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
            <SelectColumnsButton preferenceKey='outStock' />
            <ImportButton value={'asnOrderItem'} />
            <MyExportButton />
            {/* <MyExportButton /> */}
          </TopToolbar>
        )}
        perPage={DEFAULT_PAGE_SIZE}
@@ -151,11 +152,7 @@
          sx={{ width: '100%' }}
          preferenceKey='outStock'
          bulkActionButtons={
            <>
              <MyExportButton />
              <BulkDeleteButton mutationMode={OPERATE_MODE}
              />
            </>}
            <PublicTaskButton />}
          rowClick={false}
          expandSingle={true}
          omit={['id', 'createTime', 'createBy', 'memo', 'poId', 'rleStatus$']}
@@ -177,13 +174,22 @@
          <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>
            {/* <MyButton setCreateDialog={setCreateDialog} setmodalType={setmodalType} /> */}
            <CancelButton></CancelButton>
            <CancelButton />
          </WrapperField>
        </StyledDatagrid>
      </List>
      <OutOrderCreate open={manualDialog} setOpen={setManualDialog} />
      {/* <OutOrderCreate
        open={manualDialog}
        setOpen={setManualDialog}
      /> */}
      <SelectMatnrModal
        asnId={modalType}
        billReload={billReload}
        open={manualDialog}
        setOpen={setManualDialog}
      />
      <OutOrderModal
        open={createDialog}
        setOpen={setCreateDialog}
@@ -192,12 +198,40 @@
        title='AsnOrder Detail'
        drawerVal={drawerVal}
        setDrawerVal={setDrawerVal}
      >
      </PageDrawer>
      />
    </Box >
  )
}
export default OutOrderList;


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

  const pubClick = async (event) => {
    event.stopPropagation();
    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();
  }

  return (
    <Button
      onClick={pubClick}
      label={"toolbar.createWave"}
      startIcon={<PublicIcon />}
    />);
}

const MyButton = ({ setCreateDialog, setmodalType }) => {
  const record = useRecordContext();
@@ -219,7 +253,7 @@
  )
}

const CreateByOrderButton = ({setCreateDialog}) => {
const CreateByOrderButton = ({ setCreateDialog }) => {
  const record = useRecordContext();
  const notify = useNotify();
  const refresh = useRefresh();
@@ -232,15 +266,12 @@
  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 () => {
    const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
    if (code === 200) {
@@ -252,6 +283,6 @@
  }

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