出库明细动态字段不显示问题修复

skyouc

1 天以前 ae3bf92a8f0a7b80ae6d6ca73382ee372ea7b2d7

出库明细动态字段不显示问题修复

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

@@ -34,12 +34,14 @@
  Button,
  useEditContext,
  useGetRecordId,
  useRefresh,
  useGetOne
} from 'react-admin';
import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle } from '@mui/material';
import { Box, Typography, Card, Stack, Dialog, DialogActions, DialogTitle, LinearProgress } from '@mui/material';
import { styled } from '@mui/material/styles';
import OutOrderItemCreate from "./OutOrderItemCreate";
import PageDrawer from "../../components/PageDrawer";
import request from '@/utils/request';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import OutOrderItemEdit from "./OutOrderItemEdit";

@@ -129,43 +131,7 @@
          )}
          perPage={DEFAULT_ITEM_PAGE_SIZE}
        >
          <StyledDatagrid
            preferenceKey='outStockItem'
            bulkActionButtons={false}
            rowClick={false}
            omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'purQty', 'purUnit', 'trackCode', 'packName', 'qrcode', 'splrCode', 'matnrId', 'orderId','platOrderCode']}
          >
            <NumberField source="id" />
            <NumberField source="orderId" label="table.field.outStockItem.orderId" />
            <TextField source="orderCode" label="table.field.outStockItem.orderCode" />
            <TextField source="poCode" label="table.field.outStockItem.poCode" />
            <TextField source="poDetlId" label="table.field.outStockItem.poDetlId" />
            <TextField source="matnrId" label="table.field.outStockItem.matnrId" />
            <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
            <TextField source="maktx" label="table.field.outStockItem.maktx" />
            <TextField source="platOrderCode" label="table.field.outStockItem.platOrderCode" />
            <NumberField source="anfme" label="table.field.outStockItem.anfme" />
            <NumberField source="purQty" label="table.field.outStockItem.purQty" />
            <NumberField source="workQty" label="table.field.outStockItem.workQty" />
            <NumberField source="qty" label="table.field.outStockItem.qty" />
            <TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />
            <TextField source="splrBatch" label="table.field.outStockItem.splrBatch" />
            <TextField source="purUnit" label="table.field.outStockItem.purUnit" />
            <TextField source="splrCode" label="table.field.outStockItem.splrCode" />
            <TextField source="splrName" label="table.field.outStockItem.splrName" />
            <TextField source="qrcode" label="table.field.outStockItem.qrcode" />
            <TextField source="trackCode" label="table.field.outStockItem.barcode" />
            <TextField source="packName" label="table.field.outStockItem.packName" />
            <DateField source="updateTime" label="common.field.updateTime" showTime />
            <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
              <TextField source="nickname" />
            </ReferenceField>,
            <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 />
            <TextField source="memo" label="common.field.memo" sortable={false} />
          </StyledDatagrid>
          <DynamicFields />
        </List>
        <OutOrderItemCreate
          open={createDialog}
@@ -178,7 +144,7 @@
          record={select}
        />
        <PageDrawer
          title='OutStockItem Detail'
          title={false}
          drawerVal={drawerVal}
          setDrawerVal={setDrawerVal}
        >
@@ -190,3 +156,84 @@
OutOrderItemList.Context = React.createContext()

export default OutOrderItemList;


const DynamicFields = (props) => {
  const translate = useTranslate();
  const notify = useNotify();
  const [columns, setColumns] = useState([]);
  const { isLoading } = useListContext();
  const refresh = useRefresh();
  useEffect(() => {
    getDynamicFields();
  }, []);

  const getDynamicFields = async () => {
    const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
    if (code == 200) {
      const arr = [
        <NumberField source="id" />,
        <NumberField source="orderId" label="table.field.outStockItem.orderId" />,
        <TextField source="orderCode" label="table.field.outStockItem.orderCode" />,
        <TextField source="poCode" label="table.field.outStockItem.poCode" />,
        <TextField source="poDetlId" label="table.field.outStockItem.poDetlId" />,
        <TextField source="matnrId" label="table.field.outStockItem.matnrId" />,
        <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />,
        <TextField source="maktx" label="table.field.outStockItem.maktx" />,
        <TextField source="platOrderCode" label="table.field.outStockItem.platOrderCode" />,
        <NumberField source="anfme" label="table.field.outStockItem.anfme" />,
        <NumberField source="purQty" label="table.field.outStockItem.purQty" />,
        <NumberField source="workQty" label="table.field.outStockItem.workQty" />,
        <NumberField source="qty" label="table.field.outStockItem.qty" />,
        <TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />,
        <TextField source="splrBatch" label="table.field.outStockItem.splrBatch" />,
        <TextField source="purUnit" label="table.field.outStockItem.purUnit" />,
        <TextField source="splrCode" label="table.field.outStockItem.splrCode" />,
        <TextField source="splrName" label="table.field.outStockItem.splrName" />,
        <TextField source="qrcode" label="table.field.outStockItem.qrcode" />,
        <TextField source="trackCode" label="table.field.outStockItem.barcode" />,
        <TextField source="packName" label="table.field.outStockItem.packName" />,
      ]
      const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
      const lastArr = [
        <DateField source="updateTime" label="common.field.updateTime" showTime />,
        <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
          <TextField source="nickname" />
        </ReferenceField>,
        <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 />,
        <TextField source="memo" label="common.field.memo" sortable={false} />,
      ]
      setColumns([...arr, ...fields, ...lastArr]);
    } else {
      notify(msg);
    }
  }

  return (
    <Box sx={{ position: 'relative', minHeight: "60vh", }}>
      {isLoading && (
        <LinearProgress
          sx={{
            height: "2px",
            position: 'absolute',
            top: 0,
            left: 0,
            right: 0,
          }}
        />
      )}
      {columns.length > 0 &&
        <StyledDatagrid
          preferenceKey='asnOrderItem'
          bulkActionButtons={false}
          rowClick={(id, resource, record) => false}
          omit={['id', 'orderId', 'orderCode', 'poDetlId', 'poDetlCode', 'platOrderCode','matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
        >
          {columns.map((column) => column)}
        </StyledDatagrid>}
    </Box>
  )
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -198,7 +198,7 @@
     * @param type
     * @return
     * @author Ryan
     * @description 添加历史单据
     * @description 添加历史单据,产上报ERP
     * @time 2025/6/16 08:56
     */
    @Transactional(rollbackFor = Exception.class)