From 8ce2fc9e420f68e07512b9addaf514a09effb4a7 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 25 二月 2026 13:45:02 +0800
Subject: [PATCH] 优化出库明细界面

---
 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 3e568a2..1bb958d 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -44,6 +44,7 @@
                     aoi.pack_name,
                     aoi.nty_status,
                     aoi.`status`,
+                    aoi.source_warehouse_id,
                     CASE
                         aoi.ispt_result
                         WHEN 0 THEN
@@ -147,13 +148,22 @@
     </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
+               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}
+            ${ew.customSqlSegment}
+    </select>
+
+    <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
+        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
+            ${ew.customSqlSegment}
     </select>
 </mapper>

--
Gitblit v1.9.1