From 3d278c18472b644d9a795df8bc326866bb340454 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期四, 26 二月 2026 17:01:33 +0800
Subject: [PATCH] 优化出库明细界面
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 16 ++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java | 1 +
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 2 +-
rsf-admin/src/i18n/zh.js | 3 ++-
rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 55c078c..8b6c7d9 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -985,7 +985,8 @@
platItemId: '琛屽彿',
unit: '鍗曚綅',
targetWarehouseId: "浠撳簱",
- sourceWarehouseId: "鍙戣揣缁勭粐",
+ sourceWarehouseId: "寤鸿璋冨嚭浠�",
+ stockOrgName: "鍙戣揣缁勭粐",
platWorkCode: '璁″垝璺熻釜鍙�',
spec: '瑙勬牸',
},
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index f301bde..f80ec4f 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -83,7 +83,7 @@
<TextField source="platItemId" label="table.field.outStockItem.platItemId" key="platItemId" />, //琛屽彿
<TextField source="matnrCode" label="table.field.outStockItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
<TruncatedTextField source="maktx" label="table.field.outStockItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
- <TextField source="splrBatch" label="table.field.outStockItem.splrBatch" key="splrBatch" />, //鎵规
+ <TextField source="batch" label="table.field.outStockItem.splrBatch" key="batch" />, //鎵规
<TextField source="spec" label="table.field.outStockItem.spec" key="spec" />, //瑙勬牸
<TextField source="purUnit" label="table.field.outStockItem.purUnit" key="purUnit" />, //鍗曚綅
<NumberField source="anfme" label="table.field.outStockItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
@@ -100,6 +100,18 @@
* @returns {Array} 灏鹃儴鍒楁暟缁�
*/
export const getLastColumns = () => [
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <DateField source="updateTime" label="common.field.updateTime" showTime key="updateTime" />,
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false} key="createBy">
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <DateField source="createTime" label="common.field.createTime" showTime key="createTime" />,
+];
+
+export const getOutOrderItemLastColumns = () => [
+ <TextField source="stockOrgName" label="table.field.outStockItem.stockOrgName" key="stockOrgName" />, //鍙戣揣缁勭粐
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
<TextField source="nickname" />
</ReferenceField>,
@@ -144,7 +156,7 @@
return [
...getOutOrderItemFullBaseColumns(),
...getOutOrderItemBaseColumns(),
- ...getLastColumns()
+ ...getOutOrderItemLastColumns()
];
};
diff --git a/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx b/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
index 8d69432..7d52d78 100644
--- a/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
+++ b/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
@@ -173,7 +173,7 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'projectCode', 'createBy', 'createTime']}
+ omit={['id', 'orderId', 'poDetlId', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'projectCode', 'createBy', 'createTime', 'sourceWarehouseId']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java
index deea115..e952e26 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OutOrderAndItem.java
@@ -29,4 +29,5 @@
private String saleUserName;
private String customerId;
private String customerName;
+ private String stockOrgName;
}
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 1bb958d..7398085 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -160,7 +160,7 @@
<select id="queryFullOutOrderWithPaging" resultType="com.vincent.rsf.server.manager.entity.OutOrderAndItem">
SELECT mi.id, mo.po_code, mo.type, sd.label as wkType$, sale_org_name, sale_user_name, business_time,
customer_id, customer_name, plat_work_code, plat_item_id, matnr_code, maktx, batch, stock_unit,
- mi.anfme, mi.qty, source_warehouse_id, mi.update_by, mi.update_time
+ mi.anfme, mi.qty, stock_org_name, mi.update_by, mi.update_time
FROM man_asn_order_item mi
LEFT JOIN man_asn_order mo ON mi.order_id = mo.id AND mo.tenant_id = mi.tenant_id
LEFT JOIN sys_dict_data sd ON sd.dict_type_id = 27 and mo.wk_type = sd.`value` AND sd.tenant_id = mo.tenant_id
--
Gitblit v1.9.1