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

skyouc

2025-05-20 843d5b6dd50567dadcc56257f074840e80d757aa

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

@@ -64,11 +64,11 @@
const filters = [
  <SearchInput source="condition" alwaysOn />,
  <NumberInput source="asnId" label="table.field.outStockItem.asnId" />,
  <TextInput source="asnCode" label="table.field.outStockItem.asnCode" />,
  <TextInput source="asnCode" label="table.field.outStockItem.asnCode" alwaysOn/>,
  <TextInput source="poDetlId" label="table.field.outStockItem.poDetlId" />,
  <TextInput source="poDetlCode" label="table.field.outStockItem.poDetlCode" />,
  <TextInput source="matnrId" label="table.field.outStockItem.matnrId" />,
  <TextInput source="maktx" label="table.field.outStockItem.maktx" />,
  <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" />,
@@ -105,6 +105,7 @@
      <Box display="flex">
        <List
          resource="outStockItem"
          storeKey='outStockItem'
          sx={{
            flexGrow: 1,
            transition: (theme) =>
@@ -114,7 +115,7 @@
            marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
          }}
          title={"menu.outStockItem"}
          empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
          empty={false}
          filter={{ asnId: asnId, deleted: 0 }}
          filters={filters}
          sort={{ field: "create_time", order: "desc" }}
@@ -141,7 +142,6 @@
            <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="poDetlCode" label="table.field.outStockItem.poDetlCode" />
            <TextField source="matnrId" label="table.field.outStockItem.matnrId" />
            <TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
            <TextField source="maktx" label="table.field.outStockItem.maktx" />