From 17f9f7d74b7f2f3344b335441f9bf1653cff03f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:52 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/locItem/LocItemList.jsx | 102 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 53 deletions(-)
diff --git a/rsf-admin/src/page/orderItem/OrderItemList.jsx b/rsf-admin/src/page/locItem/LocItemList.jsx
similarity index 60%
copy from rsf-admin/src/page/orderItem/OrderItemList.jsx
copy to rsf-admin/src/page/locItem/LocItemList.jsx
index f90bde9..95821c1 100644
--- a/rsf-admin/src/page/orderItem/OrderItemList.jsx
+++ b/rsf-admin/src/page/locItem/LocItemList.jsx
@@ -34,8 +34,8 @@
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
-import OrderItemCreate from "./OrderItemCreate";
-import OrderItemPanel from "./OrderItemPanel";
+import LocItemCreate from "./LocItemCreate";
+import LocItemPanel from "./LocItemPanel";
import EmptyData from "../components/EmptyData";
import MyCreateButton from "../components/MyCreateButton";
import MyExportButton from '../components/MyExportButton';
@@ -63,26 +63,25 @@
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <NumberInput source="orderId" label="table.field.orderItem.orderId" />,
- <TextInput source="orderCode" label="table.field.orderItem.orderCode" />,
- <TextInput source="sourceItemId" label="table.field.orderItem.sourceItemId" />,
- <TextInput source="matnrId" label="table.field.orderItem.matnrId" />,
- <TextInput source="matnrCode" label="table.field.orderItem.matnrCode" />,
- <TextInput source="maktx" label="table.field.orderItem.maktx" />,
- <NumberInput source="anfme" label="table.field.orderItem.anfme" />,
- <TextInput source="stockUnit" label="table.field.orderItem.stockUnit" />,
- <NumberInput source="workQty" label="table.field.orderItem.workQty" />,
- <NumberInput source="purQty" label="table.field.orderItem.purQty" />,
- <TextInput source="purUnit" label="table.field.orderItem.purUnit" />,
- <NumberInput source="qty" label="table.field.orderItem.qty" />,
- <TextInput source="splrCode" label="table.field.orderItem.splrCode" />,
- <TextInput source="batch" label="table.field.orderItem.batch" />,
- <TextInput source="splrBatch" label="table.field.orderItem.splrBatch" />,
- <TextInput source="splrName" label="table.field.orderItem.splrName" />,
- <TextInput source="trackCode" label="table.field.orderItem.trackCode" />,
- <TextInput source="barcode" label="table.field.orderItem.barcode" />,
- <TextInput source="prodTime" label="table.field.orderItem.prodTime" />,
- <TextInput source="packName" label="table.field.orderItem.packName" />,
+ <NumberInput source="locId" label="table.field.locItem.locId" />,
+ <TextInput source="locCode" label="table.field.locItem.locCode" />,
+ <NumberInput source="orderId" label="table.field.locItem.orderId" />,
+ <TextInput source="type" label="table.field.locItem.type" />,
+ <NumberInput source="orderItemId" label="table.field.locItem.orderItemId" />,
+ <NumberInput source="wkType" label="table.field.locItem.wkType" />,
+ <NumberInput source="matnrId" label="table.field.locItem.matnrId" />,
+ <TextInput source="maktx" label="table.field.locItem.maktx" />,
+ <TextInput source="matnrCode" label="table.field.locItem.matnrCode" />,
+ <TextInput source="trackCode" label="table.field.locItem.trackCode" />,
+ <TextInput source="unit" label="table.field.locItem.unit" />,
+ <NumberInput source="anfme" label="table.field.locItem.anfme" />,
+ <NumberInput source="qty" label="table.field.locItem.qty" />,
+ <NumberInput source="workQty" label="table.field.locItem.workQty" />,
+ <TextInput source="batch" label="table.field.locItem.batch" />,
+ <TextInput source="splrBatch" label="table.field.locItem.splrBatch" />,
+ <TextInput source="spec" label="table.field.locItem.spec" />,
+ <TextInput source="model" label="table.field.locItem.model" />,
+ <TextInput source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
@@ -96,7 +95,7 @@
/>,
]
-const OrderItemList = () => {
+const LocItemList = () => {
const translate = useTranslate();
const [createDialog, setCreateDialog] = useState(false);
@@ -113,7 +112,7 @@
}),
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
- title={"menu.orderItem"}
+ title={"menu.locItem"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
@@ -121,42 +120,39 @@
<TopToolbar>
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
- <SelectColumnsButton preferenceKey='orderItem' />
+ <SelectColumnsButton preferenceKey='locItem' />
<MyExportButton />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
- preferenceKey='orderItem'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ preferenceKey='locItem'
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- expand={() => <OrderItemPanel />}
+ expand={() => <LocItemPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime','locId','workQty','qty', 'createBy', 'memo','fieldsIndex','opt']}
+
>
<NumberField source="id" />
- <NumberField source="orderId" label="table.field.orderItem.orderId" />
- <TextField source="orderCode" label="table.field.orderItem.orderCode" />
- <TextField source="sourceItemId" label="table.field.orderItem.sourceItemId" />
- <TextField source="matnrId" label="table.field.orderItem.matnrId" />
- <TextField source="matnrCode" label="table.field.orderItem.matnrCode" />
- <TextField source="maktx" label="table.field.orderItem.maktx" />
- <NumberField source="anfme" label="table.field.orderItem.anfme" />
- <TextField source="stockUnit" label="table.field.orderItem.stockUnit" />
- <NumberField source="workQty" label="table.field.orderItem.workQty" />
- <NumberField source="purQty" label="table.field.orderItem.purQty" />
- <TextField source="purUnit" label="table.field.orderItem.purUnit" />
- <NumberField source="qty" label="table.field.orderItem.qty" />
- <TextField source="splrCode" label="table.field.orderItem.splrCode" />
- <TextField source="batch" label="table.field.orderItem.batch" />
- <TextField source="splrBatch" label="table.field.orderItem.splrBatch" />
- <TextField source="splrName" label="table.field.orderItem.splrName" />
- <TextField source="trackCode" label="table.field.orderItem.trackCode" />
- <TextField source="barcode" label="table.field.orderItem.barcode" />
- <TextField source="prodTime" label="table.field.orderItem.prodTime" />
- <TextField source="packName" label="table.field.orderItem.packName" />
-
+ <NumberField source="locId" label="table.field.locItem.locId" />
+ <TextField source="locCode" label="table.field.locItem.locCode" />
+ <NumberField source="orderId" label="table.field.locItem.orderId" />
+ <TextField source="type" label="table.field.locItem.type" />
+ <NumberField source="orderItemId" label="table.field.locItem.orderItemId" />
+ <NumberField source="wkType" label="table.field.locItem.wkType" />
+ <NumberField source="matnrId" label="table.field.locItem.matnrId" />
+ <TextField source="maktx" label="table.field.locItem.maktx" />
+ <TextField source="matnrCode" label="table.field.locItem.matnrCode" />
+ <TextField source="trackCode" label="table.field.locItem.trackCode" />
+ <TextField source="unit" label="table.field.locItem.unit" />
+ <NumberField source="anfme" label="table.field.locItem.anfme" />
+ <TextField source="batch" label="table.field.locItem.batch" />
+ <TextField source="splrBatch" label="table.field.locItem.splrBatch" />
+ <TextField source="spec" label="table.field.locItem.spec" />
+ <TextField source="model" label="table.field.locItem.model" />
+ <TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
@@ -173,12 +169,12 @@
</WrapperField>
</StyledDatagrid>
</List>
- <OrderItemCreate
+ <LocItemCreate
open={createDialog}
setOpen={setCreateDialog}
/>
<PageDrawer
- title='OrderItem Detail'
+ title='LocItem Detail'
drawerVal={drawerVal}
setDrawerVal={setDrawerVal}
>
@@ -187,4 +183,4 @@
)
}
-export default OrderItemList;
+export default LocItemList;
--
Gitblit v1.9.1