From d476e7d1595e131f2bb7bb1a62c00fa3e82fb0a7 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:23:30 +0800
Subject: [PATCH] feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 91d8f5e..734bcc8 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -24,14 +24,17 @@
p.product_name,
sl.customer_name,
spd.totalQuantity,
+ spd.batchNos,
sor.outboundBatches
FROM shipping_info s
- LEFT JOIN (select shipping_info_id,sum(quantity) totalQuantity from shipping_product_detail GROUP BY shipping_info_id) spd ON spd.shipping_info_id = s.id
+ LEFT JOIN (select shipping_info_id, sum(quantity) totalQuantity,
+ GROUP_CONCAT(DISTINCT batch_no ORDER BY batch_no SEPARATOR ',') batchNos
+ from shipping_product_detail GROUP BY shipping_info_id) spd ON spd.shipping_info_id = s.id
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
left join product_model pm on slp.product_model_id = pm.id
left join product p on pm.product_id = p.id
- left join (select record_id,GROUP_CONCAT(outbound_batches SEPARATOR ',') AS outboundBatches
+ left join (select record_id, GROUP_CONCAT(DISTINCT outbound_batches SEPARATOR ',') AS outboundBatches
from stock_out_record
where record_type='13'and approval_status=1
group by record_id)sor on sor.record_id= s.id
--
Gitblit v1.9.3