From 14f6548120b5d7f58ae2082454508a26ddac1db8 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 25 二月 2026 14:01:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 65e28f7..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
@@ -153,6 +154,16 @@
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}
+ ${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