From e21d8767d595eff3d700d7d0b9eeed3ed2317fef Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期四, 05 二月 2026 08:35:21 +0800
Subject: [PATCH] 优化入库通知明细页
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 14 +++++++++++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java | 5 ++---
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 3 +--
rsf-admin/src/i18n/zh.js | 5 +++++
rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx | 6 ++----
5 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 650b82c..7c26330 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -785,6 +785,11 @@
saleUserName: '閿�鍞憳',
customerId: '瀹㈡埛缂栫爜',
customerName: '瀹㈡埛',
+ purchaseOrgName: '閲囪喘缁勭粐',
+ purchaseUserName: '閲囪喘鍛�',
+ businessTime: '閲囪喘鏃ユ湡',
+ supplierId: '渚涘簲鍟嗙紪鐮�',
+ supplierName: '渚涘簲鍟�',
},
outStock: {
code: "鍑哄簱鍗曞彿",
diff --git a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
index b3fa119..2dbbe10 100644
--- a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
@@ -142,10 +142,8 @@
const result = await fetchInOrderItemFullColumns();
if (result.success) {
const hiddenSources = [
- 'splrName',
- 'businessTime', 'extendFields.[businessTime]',
- 'wkType', 'extendFields.[wkType]',
- 'type', 'extendFields.[type]'
+ 'splrName',
+ 'type', 'extendFields.[type]',
];
const columns = result.columns.filter(col => !hiddenSources.includes(col.props.source));
setColumns(columns);
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 2e8e564..6448da6 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -29,7 +29,15 @@
export const getInOrderItemFullBaseColumns = () => [
<TextField source="poCode" label="table.field.asnOrder.poCode" key="poCode" />,
- <TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />
+ <TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />,
+
+ <TextField source="purchaseOrgName" label="table.field.asnOrder.purchaseOrgName" key="purchaseOrgName" />,
+ <TextField source="purchaseUserName" label="table.field.asnOrder.purchaseUserName" key="purchaseUserName" />,
+ <DateField source="businessTime" label="table.field.asnOrder.businessTime" key="businessTime" />,
+ <TextField source="supplierId" label="table.field.asnOrder.supplierId" key="supplierId" />,
+ <TextField source="supplierName" label="table.field.asnOrder.supplierName" key="supplierName" />,
+
+ // <TextField source="batch" label="table.field.asnOrder.batch" key="batch" />
];
/**
@@ -66,9 +74,9 @@
<TextField source="platItemId" label="table.field.asnOrderItem.platItemId" key="platItemId" />, //琛屽彿
<TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
<TruncatedTextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" maxLength={20} />, //鐗╂枡鍚嶇О
- <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
+ <TextField source="batch" label="table.field.asnOrderItem.splrBatch" key="batch" />, //鎵规
<TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
- <TextField source="purUnit" label="table.field.asnOrderItem.unit" key="purUnit" />, //鍗曚綅
+ <TextField source="stockUnit" label="table.field.asnOrderItem.unit" key="stockUnit" />, //鍗曚綅
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
<NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
<TextField source="targetWarehouseId" label="table.field.asnOrderItem.targetWarehouseId" key="targetWarehouseId" />, //寤鸿鐩爣浠�
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java
index 65c008d..a32b861 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java
@@ -6,7 +6,6 @@
public class InOrderAndItem {
private Long id;
-
private String poCode;
private String type;
private String wkType$;
@@ -24,7 +23,7 @@
private String anfme;
private String qty;
private String targetWarehouseId;
- private String username;
- private String createTime;
+ private String updateBy;
+ private String updateTime;
}
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 206196a..65e28f7 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -149,11 +149,10 @@
<select id="queryFullOrderWithPaging" resultType="com.vincent.rsf.server.manager.entity.InOrderAndItem">
SELECT mi.id, mo.po_code, mo.type, sd.label as wkType$, purchase_org_name, purchase_user_name, business_time,
supplier_id, supplier_name, plat_work_code, plat_item_id, matnr_code, maktx, batch, stock_unit,
- mi.anfme, mi.qty, target_warehouse_id, username, mi.create_time
+ mi.anfme, mi.qty, target_warehouse_id, 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
- LEFT JOIN sys_user su ON mi.create_by = su.id AND su.tenant_id = mo.tenant_id
${ew.customSqlSegment}
</select>
</mapper>
--
Gitblit v1.9.1