From d2e0994f67495fd436a2e8ad02cb7e4a7e53fe0c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 08:04:54 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/check/CheckOrderPub.jsx | 51 ++++++++++++++++++---------------------------------
1 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
index 5b5b530..67af707 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
@@ -3,36 +3,14 @@
import {
List,
DatagridConfigurable,
- SearchInput,
- TopToolbar,
Button,
- SelectColumnsButton,
- EditButton,
- FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
- WrapperField,
- useRecordContext,
useTranslate,
useNotify,
useListContext,
- FunctionField,
TextField,
NumberField,
- DateField,
- BooleanField,
- ReferenceField,
- TextInput,
- DateTimeInput,
- DateInput,
- SelectInput,
- NumberInput,
ReferenceInput,
- ReferenceArrayInput,
AutocompleteInput,
- DeleteButton,
- SimpleForm,
required,
Form,
useRefresh,
@@ -85,7 +63,16 @@
setRows(fetchRows)
} else {
const mas = fetchRows.filter(item => selectedMatnr.includes(item.matnrCode));
- setRows(mas)
+ console.log(mas);
+ let ids = mas.map(item => item.matnrCode);
+ console.log(ids);
+ const { data: { code, data, msg } } = request.get('/check/order/items/' + ids );
+ if (code === 200) {
+ setFetchRows(data)
+ } else {
+ notify(msg);
+ }
+ // setRows(mas)
}
}, [selectedMatnr])
@@ -139,9 +126,8 @@
if (formData.waveId == null && formData.waveId == undefined) {
return
}
- const { data: { code, data, msg } } = await request.post('/outStock/order/getOutTaskItems', { ...formData });
+ const { data: { code, data, msg } } = await request.post('/check/order/items', { ...formData });
if (code === 200) {
- // setRows(data)
setFetchRows(data)
} else {
notify(msg);
@@ -177,8 +163,8 @@
</ReferenceInput>
</Form>
<List
- resource="outStockItem"
- storeKey='outStockItem'
+ resource="checkItem"
+ storeKey='checkItem'
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -186,7 +172,7 @@
duration: theme.transitions.duration.enteringScreen,
}),
}}
- title={"menu.outStockItem"}
+ title={"menu.checkItem"}
empty={false}
filter={{ orderId: record?.id, deleted: 0 }}
sort={{ field: "create_time", order: "desc" }}
@@ -199,15 +185,14 @@
/>
<StyledDatagrid
storeKey={"outStockPublic"}
- preferenceKey='outStockItem'
+ preferenceKey='checkItem'
bulkActionButtons={<>
<ComfirmButton />
</>}
- omit={['id', 'splrName', 'qty', 'poCode',]}
+ omit={['id', 'splrName', 'qty',]}
>
<NumberField source="id" />
- <TextField source="asnCode" label="table.field.outStockItem.asnCode" />
- <TextField source="poCode" label="table.field.outStockItem.poCode" />
+ <TextField source="orderCode" label="table.field.outStockItem.orderCode" />
<TextField source="matnrCode" label="table.field.outStockItem.matnrCode" />
<TextField source="maktx" label="table.field.outStockItem.maktx" />
<NumberField source="anfme" label="table.field.outStockItem.anfme" />
@@ -241,7 +226,7 @@
</Grid>
</Grid>
<Grid>
- <OutStockSiteDialog
+ <CheckOrderSiteDialog
selectedValue={selectedValue}
open={dialog}
onClose={handleClose}
--
Gitblit v1.9.1