From 1e1cedc70758a7c17ccf63ea11d1db70c409aa66 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 09:45:15 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 71ff6c4..070c3a7 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -65,12 +65,15 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <NumberInput source="asnId" label="table.field.asnOrderItem.asnId" />,
- <TextInput source="asnCode" label="table.field.asnOrderItem.asnCode" />,
+ <NumberInput source="orderId" label="table.field.asnOrderItem.orderId" />,
+ <TextInput source="orderCode" label="table.field.asnOrderItem.orderCode" />,
<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" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberInput source="anfme" label="table.field.asnOrderItem.anfme" />,
<TextInput source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
<NumberInput source="purQty" label="table.field.asnOrderItem.purQty" />,
@@ -118,7 +121,7 @@
}}
title={"menu.asnOrderItem"}
empty={false}
- filter={{ asnId: asnId}}
+ filter={{ orderId: asnId }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -173,8 +176,8 @@
if (code == 200) {
const arr = [
<NumberField source="id" />,
- <NumberField source="asnId" label="table.field.asnOrderItem.asnId" />,
- <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />,
+ <NumberField source="orderId" label="table.field.asnOrderItem.orderId" />,
+ <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" />,
<TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
<TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
<TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
@@ -182,13 +185,16 @@
<TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />,
<TextField source="maktx" label="table.field.asnOrderItem.maktx" />,
<TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />,
+ <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<TextField source="spec" label="table.field.asnOrderItem.spec" />,
<TextField source="model" label="table.field.asnOrderItem.model" />,
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" />,
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
<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="isptResult$" label="table.field.asnOrderItem.isptResult" />,
@@ -232,7 +238,7 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'asnId', 'poDetlId', 'poDetlCode', 'matnrId', 'purQty', 'purUnit', 'qrcode', 'trackCode']}
+ omit={['id', 'orderId', 'orderCode', 'poDetlId', 'poDetlCode', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1