From c46d1d8c3b9875f051a6ec3c4a1d3fa7bd32e5db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 15 五月 2025 17:15:21 +0800
Subject: [PATCH] 新增库存管理 新增库存明细
---
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 153 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 111 insertions(+), 42 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index e3e7a1f..13e72c0 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -29,20 +29,24 @@
NumberInput,
ReferenceInput,
ReferenceArrayInput,
+ useRefresh,
AutocompleteInput,
DeleteButton,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Typography, Card, Stack, LinearProgress } from '@mui/material';
import { styled } from '@mui/material/styles';
import WarehouseAreasItemCreate from "./WarehouseAreasItemCreate";
import WarehouseAreasItemPanel from "./WarehouseAreasItemPanel";
import EmptyData from "../components/EmptyData";
+import request from '@/utils/request';
import MyCreateButton from "../components/MyCreateButton";
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import WarehouseIsptResult from "./WarehouseIsptResult"
+
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -60,8 +64,8 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<NumberInput source="areaId" label="table.field.warehouseAreasItem.areaId" />,
+ <TextInput source="asnCode" label="table.field.warehouseAreasItem.asnCode" />,
<TextInput source="areaName" label="table.field.warehouseAreasItem.areaName" />,
<NumberInput source="matnrId" label="table.field.warehouseAreasItem.matnrId" />,
<TextInput source="matnrName" label="table.field.warehouseAreasItem.matnrName" />,
@@ -94,79 +98,144 @@
const WarehouseAreasItemList = () => {
const translate = useTranslate();
-
+ const [itemInfo, setItemInfo] = useState({})
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
return (
<Box display="flex">
<List
+ title={"menu.warehouseAreasItem"}
+ empty={false}
+ filters={filters}
+ sort={{ field: "create_time", order: "desc" }}
sx={{
flexGrow: 1,
transition: (theme) =>
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.warehouseAreasItem"}
- empty={false}
- filters={filters}
- sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='warehouseAreasItem' />
<MyExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
- <StyledDatagrid
- preferenceKey='warehouseAreasItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo', 'areaId', 'matnrId', 'batch', 'shipperId', 'splrId']}
- >
- <NumberField source="id" />
- <NumberField source="areaId" label="table.field.warehouseAreasItem.areaId" />
- <TextField source="areaName" label="table.field.warehouseAreasItem.areaName" />
- <NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />
- <TextField source="maktx" label="table.field.warehouseAreasItem.matnrName" />
- <TextField source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />
- <TextField source="trackCode" label="table.field.warehouseAreasItem.barcode" />
- <NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />
- <TextField source="batch" label="table.field.warehouseAreasItem.batch" />
- <TextField source="unit" label="table.field.warehouseAreasItem.unit" />
- <TextField source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />
- <TextField source="brand" label="table.field.warehouseAreasItem.brand" />
- <TextField source="shipperId" label="table.field.warehouseAreasItem.shipperId" />
- <TextField source="splrId" label="table.field.warehouseAreasItem.splrId" />
- <NumberField source="weight" label="table.field.warehouseAreasItem.weight" />
- <TextField source="prodTime" label="table.field.warehouseAreasItem.prodTime" />
- <TextField source="splrBtch" label="table.field.warehouseAreasItem.splrBtch" />
- <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 />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
- <TextField source="memo" label="common.field.memo" sortable={false} />
-
- </StyledDatagrid>
+ <DynamicFields
+ drawerVal={drawerVal}
+ setDrawerVal={setDrawerVal}
+ itemInfo={itemInfo}
+ setItemInfo={setItemInfo} />
</List>
<WarehouseAreasItemCreate
open={createDialog}
setOpen={setCreateDialog}
/>
- <PageDrawer
+ <WarehouseIsptResult
+ record={itemInfo}
+ drawerVal={drawerVal}
+ from="warehosueItem"
+ setDrawerVal={setDrawerVal}
+ >
+ </WarehouseIsptResult>
+ {/* <PageDrawer
title='WarehouseAreasItem Detail'
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
- </PageDrawer>
+ </PageDrawer> */}
</Box>
)
}
export default WarehouseAreasItemList;
+
+
+const DynamicFields = (props) => {
+ const { drawerVal, setDrawerVal, itemInfo, setItemInfo } = 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" />,
+ <TextField source="asnCode" label="table.field.warehouseAreasItem.asnCode" />,
+ <NumberField source="areaId" label="table.field.warehouseAreasItem.areaId" />,
+ <TextField source="areaName" label="table.field.warehouseAreasItem.areaName" />,
+ <NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />,
+ <TextField source="maktx" label="table.field.warehouseAreasItem.matnrName" />,
+ <TextField source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />,
+ <TextField source="trackCode" label="table.field.warehouseAreasItem.barcode" />,
+ <NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />,
+ <NumberField source="workQty" label="table.field.warehouseAreasItem.workQty" />,
+ <NumberField source="qty" label="table.field.warehouseAreasItem.qty" />,
+ // <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
+ // onClick={(event, record, val) => {
+ // event.stopPropagation();
+ // setItemInfo(record)
+ // setDrawerVal(!!drawerVal && drawerVal === val ? null : val);
+ // }}
+ // />,
+ <TextField source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />,
+ <TextField source="batch" label="table.field.warehouseAreasItem.batch" />,
+ <TextField source="unit" label="table.field.warehouseAreasItem.unit" />,
+ <TextField source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />,
+ <TextField source="brand" label="table.field.warehouseAreasItem.brand" />,
+ <TextField source="shipperId" label="table.field.warehouseAreasItem.shipperId" />,
+ <TextField source="splrId" label="table.field.warehouseAreasItem.splrId" />,
+ <TextField source="isptResult$" label="table.field.warehouseAreasItem.isptResult" sortable={false} />,
+ <NumberField source="weight" label="table.field.warehouseAreasItem.weight" />,
+ <TextField source="prodTime" label="table.field.warehouseAreasItem.prodTime" />,
+ ]
+ const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
+ const lastArr = [
+ <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 />,
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} />,
+ <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='warehouseAreasItem'
+ bulkActionButtons={false}
+ rowClick={(id, resource, record) => false}
+ omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId']}
+ >
+ {columns.map((column) => column)}
+ </StyledDatagrid>}
+ </Box>
+ )
+}
--
Gitblit v1.9.1