Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-05-23 99f5c058c42521640d815f3d52dc722a5d5ad4c4

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

@@ -50,7 +50,6 @@
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
  '& .css-1vooibu-MuiSvgIcon-root': {
    height: '.9em',

  },
  '& .RaDatagrid-row': {
    cursor: 'auto'
@@ -64,22 +63,22 @@

const filters = [
  <SearchInput source="condition" alwaysOn />,
  <NumberInput source="asnId" label="table.field.asnOrderItem.asnId" />,
  <TextInput source="asnCode" label="table.field.asnOrderItem.asnCode" />,
  <TextInput source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
  <TextInput source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
  <TextInput source="matnrId" label="table.field.asnOrderItem.matnrId" />,
  <TextInput source="maktx" label="table.field.asnOrderItem.maktx" />,
  <NumberInput source="anfme" label="table.field.asnOrderItem.anfme" />,
  <TextInput source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
  <NumberInput source="purQty" label="table.field.asnOrderItem.purQty" />,
  <TextInput source="purUnit" label="table.field.asnOrderItem.purUnit" />,
  <NumberInput source="qty" label="table.field.asnOrderItem.qty" />,
  <TextInput source="splrCode" label="table.field.asnOrderItem.splrCode" />,
  <TextInput source="splrName" label="table.field.asnOrderItem.splrName" />,
  <TextInput source="qrcode" label="table.field.asnOrderItem.qrcode" />,
  <TextInput source="trackCode" label="table.field.asnOrderItem.barcode" />,
  <TextInput source="packName" label="table.field.asnOrderItem.packName" />,
  <NumberInput source="asnId" label="table.field.outStockItem.asnId" />,
  <TextInput source="asnCode" label="table.field.outStockItem.asnCode" alwaysOn/>,
  <TextInput source="poDetlId" label="table.field.outStockItem.poDetlId" />,
  <TextInput source="matnrId" label="table.field.outStockItem.matnrId" />,
  <TextInput source="maktx" label="table.field.outStockItem.maktx" alwaysOn/>,
  <TextInput source="matnrCode" label="table.field.outStockItem.matnrCode" alwaysOn/>,
  <NumberInput source="anfme" label="table.field.outStockItem.anfme" />,
  <TextInput source="stockUnit" label="table.field.outStockItem.stockUnit" />,
  <NumberInput source="purQty" label="table.field.outStockItem.purQty" />,
  <TextInput source="purUnit" label="table.field.outStockItem.purUnit" />,
  <NumberInput source="qty" label="table.field.outStockItem.qty" />,
  <TextInput source="splrCode" label="table.field.outStockItem.splrCode" />,
  <TextInput source="splrName" label="table.field.outStockItem.splrName" />,
  <TextInput source="qrcode" label="table.field.outStockItem.qrcode" />,
  <TextInput source="trackCode" label="table.field.outStockItem.barcode" />,
  <TextInput source="packName" label="table.field.outStockItem.packName" />,
  <TextInput label="common.field.memo" source="memo" />,
  <SelectInput
    label="common.field.status"
@@ -99,13 +98,14 @@
  const [drawerVal, setDrawerVal] = useState(false);
  const [select, setSelect] = useState({});
  const asnId = useGetRecordId();
  const { data: dicts, isPending, error } = useGetOne('asnOrder', { id: asnId });
  const { data: dicts, isPending, error } = useGetOne('outStock', { id: asnId });

  return (
    <>
      <Box display="flex">
        <List
          resource="asnOrderItem"
          resource="outStockItem"
          storeKey='outStockItem'
          sx={{
            flexGrow: 1,
            transition: (theme) =>
@@ -114,8 +114,8 @@
              }),
            marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
          }}
          title={"menu.asnOrderItem"}
          empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
          title={"menu.outStockItem"}
          empty={false}
          filter={{ asnId: asnId, deleted: 0 }}
          filters={filters}
          sort={{ field: "create_time", order: "desc" }}
@@ -123,14 +123,14 @@
            <TopToolbar>
              <FilterButton />
              <MyCreateButton onClick={() => { setCreateDialog(true) }} />
              <SelectColumnsButton preferenceKey='asnOrderItem' />
              <SelectColumnsButton preferenceKey='outStockItem' />
              {/* <MyExportButton /> */}
            </TopToolbar>
          )}
          perPage={DEFAULT_ITEM_PAGE_SIZE}
        >
          <StyledDatagrid
            preferenceKey='asnOrderItem'
            preferenceKey='outStockItem'
            bulkActionButtons={false}
            rowClick={(id, resource, record) => {
              setSelect(record)
@@ -139,23 +139,22 @@
             omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'matnrId', 'asnId']}
          >
            <NumberField source="id" />
            <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
            <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />
            <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />
            <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />
            <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />
            <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />
            <TextField source="maktx" label="table.field.asnOrderItem.maktx" />
            <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />
            <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />
            <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
            <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
            <NumberField source="qty" label="table.field.asnOrderItem.qty" />
            <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
            <TextField source="splrName" label="table.field.asnOrderItem.splrName" />
            <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
            <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
            <TextField source="packName" label="table.field.asnOrderItem.packName" />
            <NumberField source="asnId" label="table.field.outStockItem.asnId" />
            <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
            <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" />
            <NumberField source="anfme" label="table.field.outStockItem.anfme" />
            <TextField source="stockUnit" label="table.field.outStockItem.stockUnit" />
            <NumberField source="purQty" label="table.field.outStockItem.purQty" />
            <TextField source="purUnit" label="table.field.outStockItem.purUnit" />
            <NumberField source="qty" label="table.field.outStockItem.qty" />
            <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" />
            <TextField source="updateBy$" label="common.field.updateBy" />
            <DateField source="updateTime" label="common.field.updateTime" showTime />
            <TextField source="createBy$" label="common.field.createBy" />
@@ -175,7 +174,7 @@
          record={select}
        />
        <PageDrawer
          title='AsnOrderItem Detail'
          title='OutStockItem Detail'
          drawerVal={drawerVal}
          setDrawerVal={setDrawerVal}
        >