From 10958d1143d59916185e73da79669c5f66a8e849 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 二月 2026 15:49:24 +0800
Subject: [PATCH] #入库订单明细
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 21 +++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/InOrderAndItem.java | 2 ++
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 2 +-
rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx | 14 +++++---------
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
index 060c0e6..b3fa119 100644
--- a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
@@ -43,7 +43,7 @@
import useTableLayout from '@/utils/useTableLayout';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import { fetchInOrderItemColumns } from '../config/orderItemColumns';
+import { fetchInOrderItemFullColumns } from '../config/orderItemColumns';
const filters = [
<SearchInput source="condition" alwaysOn />,
@@ -86,7 +86,7 @@
<>
<Box display="flex">
<List
- resource="asnOrderItem/in"
+ resource="asnOrderItemFull/in"
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -131,11 +131,7 @@
const { isLoading } = useListContext();
const refresh = useRefresh();
const omittedFields = [
- 'id', 'orderId', 'orderCode', 'poCode', 'poId', 'wkType', 'type', 'checkType',
- 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode',
- 'splrName', 'projectCode', 'supplierId', 'supplierName', 'priceUnitId',
- 'shipperId', 'businessTime', 'extendFields.[businessTime]',
- 'extendFields.[wkType]', 'extendFields.[type]'
+ 'id'
];
useEffect(() => {
@@ -143,7 +139,7 @@
}, []);
const getDynamicFields = async () => {
- const result = await fetchInOrderItemColumns();
+ const result = await fetchInOrderItemFullColumns();
if (result.success) {
const hiddenSources = [
'splrName',
@@ -190,7 +186,7 @@
{ field: 'anfme', type: 'sum', label: 'table.field.asnOrderItem.anfme' },
{ field: 'qty', type: 'max', label: 'table.field.asnOrderItem.qty' },
]}
- stickyRight={['createTime']}
+ // stickyRight={['createTime']}
storeKey='asnOrderItem'
bulkActionButtons={false}
rowClick={false}
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index c5b0273..2e8e564 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -27,6 +27,11 @@
);
};
+export const getInOrderItemFullBaseColumns = () => [
+ <TextField source="poCode" label="table.field.asnOrder.poCode" key="poCode" />,
+ <TextField source="wkType$" label="table.field.asnOrder.wkType" key="wkType$" />
+];
+
/**
* 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
* @returns {Array} 鍩虹鍒楁暟缁�
@@ -97,6 +102,14 @@
];
};
+export const buildInOrderItemFullColumns = () => {
+ return [
+ ...getInOrderItemFullBaseColumns(),
+ ...getInOrderItemBaseColumns(),
+ ...getLastColumns()
+ ];
+};
+
/**
* 缁勫悎鍑哄簱璁㈠崟鏄庣粏鎵�鏈夊垪閰嶇疆
* @returns {Array} 瀹屾暣鐨勫垪閰嶇疆鏁扮粍
@@ -131,3 +144,11 @@
return { success: false, msg: error.message };
}
};
+
+export const fetchInOrderItemFullColumns = async () => {
+ try {
+ return { success: true, columns: buildInOrderItemFullColumns() };
+ } catch (error) {
+ return { success: false, msg: error.message };
+ }
+};
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 1b14fbd..65c008d 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
@@ -5,6 +5,8 @@
@Data
public class InOrderAndItem {
+ private Long id;
+
private String poCode;
private String type;
private String wkType$;
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 3e568a2..206196a 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -147,7 +147,7 @@
</select>
<select id="queryFullOrderWithPaging" resultType="com.vincent.rsf.server.manager.entity.InOrderAndItem">
- SELECT mo.po_code, mo.type, sd.label as wkType$, purchase_org_name, purchase_user_name, business_time,
+ 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
FROM man_asn_order_item mi
--
Gitblit v1.9.1