From d416f783f852c10c3bb2e0bfb8a7b0d4e6fe0e3d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 25 二月 2026 13:15:29 +0800
Subject: [PATCH] lsh#

---
 rsf-admin/src/page/orders/config/orderItemColumns.jsx |   59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
index 30a945a..6448da6 100644
--- a/rsf-admin/src/page/orders/config/orderItemColumns.jsx
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -27,25 +27,38 @@
     );
 };
 
+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="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" />
+];
+
 /**
  * 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
  * @returns {Array} 鍩虹鍒楁暟缁�
  */
 export const getOutOrderItemBaseColumns = () => [
     <NumberField source="id" key="id" />, // id
-    <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
-    <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
-    <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
-    <TextField source="splrName" label="table.field.asnOrderItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
-    <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="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
-    <TextField source="unit" label="table.field.asnOrderItem.unit" key="unit" />, //鍗曚綅
-    <NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
-    <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
-    <TextField source="sourceWareHouseId" label="table.field.asnOrderItem.sourceWareHouseId" key="sourceWareHouseId" />, //璋冨嚭浠�
+    <TextField source="orderCode" label="table.field.outStockItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+    <TextField source="platWorkCode" label="table.field.outStockItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
+    <TextField source="splrCode" label="table.field.outStockItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
+    <TextField source="splrName" label="table.field.outStockItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
+    <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="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" />, //搴旀敹鏁伴噺
+    <NumberField source="qty" label="table.field.outStockItem.qty" key="qty" />, //瀹炴敹鏁伴噺
+    <TextField source="sourceWarehouseId" label="table.field.outStockItem.sourceWarehouseId" key="sourceWarehouseId" />, //璋冨嚭浠�
 ];
 
 /**
@@ -61,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" />, //寤鸿鐩爣浠�
@@ -92,6 +105,14 @@
  */
 export const buildInOrderItemColumns = () => {
     return [
+        ...getInOrderItemBaseColumns(),
+        ...getLastColumns()
+    ];
+};
+
+export const buildInOrderItemFullColumns = () => {
+    return [
+        ...getInOrderItemFullBaseColumns(),
         ...getInOrderItemBaseColumns(),
         ...getLastColumns()
     ];
@@ -131,3 +152,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 };
+    }
+};

--
Gitblit v1.9.1