From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index fdcb54e..ca237eb 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -22,14 +22,22 @@
pm.unit,
ppr.process_route_code,
pb.bom_no,
+ sl.id as sales_ledger_id,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff,
sl.delivery_date,
+ sl.actually_delivery_date,
+ sl.execution_date,
+ t6.id as print_id,
CASE
WHEN shipping_status_counts.total_count = 0 THEN false
WHEN shipping_status_counts.unshipped_count = 0 THEN true
ELSE false
- END AS is_fh
+ END AS is_fh,
+ CASE
+ WHEN t7.product_num > 0 THEN 1
+ ELSE 0
+ END AS has_product
from product_order po
left join sales_ledger sl on po.sales_ledger_id = sl.id
LEFT JOIN (
@@ -41,9 +49,17 @@
) shipping_status_counts ON sl.id = shipping_status_counts.sales_ledger_id
left join product_model pm on po.product_model_id = pm.id
left join product p on pm.product_id = p.id
- left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id
+ left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id and slp.type = 1
left join product_process_route ppr on po.id = ppr.product_order_id
left join product_bom pb on pb.id = ppr.bom_id
+ left join production_print_order as t6 on t6.product_order_id = po.id
+ LEFT JOIN (SELECT n1.product_order_id,
+ COUNT(1) AS product_num
+ FROM product_work_order n1
+ INNER JOIN production_product_main n2
+ ON n1.id = n2.work_order_id
+ GROUP BY n1.product_order_id) t7
+ ON t7.product_order_id = po.id
<where>
<if test="c.npsNo != null and c.npsNo != ''">
and po.nps_no like concat('%',#{c.npsNo},'%')
@@ -64,6 +80,7 @@
and po.create_time between #{c.startTime} and #{c.endTime}
</if>
</where>
+ order by po.id desc
</select>
<select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
select pr.*
@@ -81,7 +98,10 @@
p.product_name,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ ps.process_route_open_num,
+ ps.process_route_num,
+ ps.process_route_add_num
from
product_structure ps
left join product_model pm on ps.product_model_id = pm.id
--
Gitblit v1.9.3