From 0406c675e143bbb08284fd55381261afcc587afc Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 15:51:36 +0800
Subject: [PATCH] 月结增加明细
---
src/main/resources/mapper/MonthlySettleMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/MonthlySettleMapper.xml b/src/main/resources/mapper/MonthlySettleMapper.xml
index 77e8f9f..a0461e5 100644
--- a/src/main/resources/mapper/MonthlySettleMapper.xml
+++ b/src/main/resources/mapper/MonthlySettleMapper.xml
@@ -150,6 +150,66 @@
WHERE monthly_settle_id = #{settleId}
</update>
+ <!-- 鏌ヨ鏈堢粨鏄庣粏娴佹按锛堝叆搴撹鍗曟槑缁嗭級 -->
+ <select id="selectDetailFlowFromPakin" resultType="com.zy.asrs.entity.result.MonthlySettleDetailFlowVO">
+ SELECT
+ molpi.id as orderId,
+ molpi.order_no as orderNo,
+ molpi.order_time as orderTime,
+ modlpi.id as orderDetlId,
+ modlpi.matnr,
+ modlpi.maktx,
+ modlpi.batch,
+ modlpi.brand,
+ modlpi.specs,
+ modlpi.model,
+ modlpi.color,
+ modlpi.unit,
+ modlpi.qty,
+ COALESCE(modlpi.pakin_pakout_status, molpi.pakin_pakout_status) as pakinPakoutStatus,
+ CASE
+ WHEN COALESCE(modlpi.pakin_pakout_status, molpi.pakin_pakout_status) = 1 THEN '鍏ュ簱'
+ WHEN COALESCE(modlpi.pakin_pakout_status, molpi.pakin_pakout_status) = 2 THEN '鍑哄簱'
+ ELSE '鏈煡'
+ END as pakinPakoutStatusName
+ FROM man_order_log_pakin molpi
+ INNER JOIN man_order_detl_log_pakin modlpi ON molpi.id = modlpi.order_id
+ WHERE molpi.monthly_settle_id = #{settleId}
+ AND molpi.status = 1
+ AND COALESCE(modlpi.pakin_pakout_status, molpi.pakin_pakout_status) IN (1, 2)
+ ORDER BY molpi.order_time, molpi.order_no, modlpi.id
+ </select>
+
+ <!-- 鏌ヨ鏈堢粨鏄庣粏娴佹按锛堝嚭搴撹鍗曟槑缁嗭級 -->
+ <select id="selectDetailFlowFromPakout" resultType="com.zy.asrs.entity.result.MonthlySettleDetailFlowVO">
+ SELECT
+ molpo.id as orderId,
+ molpo.order_no as orderNo,
+ molpo.order_time as orderTime,
+ modlpo.id as orderDetlId,
+ modlpo.matnr,
+ modlpo.maktx,
+ modlpo.batch,
+ modlpo.brand,
+ modlpo.specs,
+ modlpo.model,
+ modlpo.color,
+ modlpo.unit,
+ modlpo.qty,
+ COALESCE(modlpo.pakin_pakout_status, molpo.pakin_pakout_status) as pakinPakoutStatus,
+ CASE
+ WHEN COALESCE(modlpo.pakin_pakout_status, molpo.pakin_pakout_status) = 1 THEN '鍏ュ簱'
+ WHEN COALESCE(modlpo.pakin_pakout_status, molpo.pakin_pakout_status) = 2 THEN '鍑哄簱'
+ ELSE '鏈煡'
+ END as pakinPakoutStatusName
+ FROM man_order_log_pakout molpo
+ INNER JOIN man_order_detl_log_pakout modlpo ON molpo.id = modlpo.order_id
+ WHERE molpo.monthly_settle_id = #{settleId}
+ AND molpo.status = 1
+ AND COALESCE(modlpo.pakin_pakout_status, molpo.pakin_pakout_status) IN (1, 2)
+ ORDER BY molpo.order_time, molpo.order_no, modlpo.id
+ </select>
+
</mapper>
--
Gitblit v1.9.1