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/ProductWorkOrderMapper.xml | 75 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 58559f7..6ed0d27 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -20,35 +20,41 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
- pwo.*,
- pp.NAME as processName,
- pm.model,
- pm.unit,
- p.product_name AS productName,
- po.nps_no AS productOrderNpsNo,
- ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
- CASE
- WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
- ELSE '姝ｅ父'
- END AS work_order_type,
- pp.device_name
+ pwo.*,
+ pp.NAME as processName,
+ pp.id as processId,
+ pm.model,
+ pm.unit,
+ IF(EXISTS(
+ SELECT 1 FROM production_machine_record pmr
+ WHERE pmr.work_order_id = pwo.id
+ AND pmr.report_status = 0
+ ), FALSE, true ) AS has_unreported_machine,
+ p.product_name AS productName,
+ po.nps_no AS productOrderNpsNo,
+ ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
+ CASE
+ WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
+ ELSE '姝ｅ父'
+ END AS work_order_type,
+ pp.device_name,
+ pp.user_ids as process_user_ids,
+ t8.product_name as final_product_model
FROM
- product_work_order pwo
- LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
- LEFT JOIN product_order po ON po.id = pwo.product_order_id
- LEFT JOIN product_process pp ON pp.id = ppri.process_id
- LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
- LEFT JOIN product p ON p.id = pm.product_id
- where 1=1
+ product_work_order pwo
+ LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
+ LEFT JOIN product_order po ON po.id = pwo.product_order_id
+ LEFT JOIN product_process pp ON pp.id = ppri.process_id
+ LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
+ LEFT JOIN product p ON p.id = pm.product_id
+ left join product_model t7 on t7.id = po.product_model_id
+ left join product as t8 on t7.product_id = t8.id
+ <where>
<if test="c.workOrderNo != null and c.workOrderNo != ''">
- and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
+ pwo.work_order_no like concat('%', #{c.workOrderNo}, '%')
</if>
- <if test="c.planStartTime != null and c.planEndTime != null">
- and DATE(pwo.create_time) between #{c.planStartTime} and #{c.planEndTime}
- </if>
- <if test="c.productOrderId != null and c.productOrderId != ''">
- and pwo.product_order_id = #{c.productOrderId}
- </if>
+ </where>
+ order by po.id desc,pwo.id asc
</select>
<select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
@@ -60,8 +66,8 @@
po.nps_no AS productOrderNpsNo,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
sum(ppo.scrap_qty) scrapQty,
- ppm.device_id,
- ppm.device_name
+ pp.device_id,
+ pp.device_name
FROM
product_work_order pwo
LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -73,8 +79,8 @@
LEFT JOIN product p ON p.id = pm.product_id
WHERE pwo.id = #{id}
GROUP BY pwo.id, pwo.product_process_route_item_id, pwo.create_time, pwo.update_time, pwo.work_order_no, pwo.plan_start_time, pwo.plan_end_time, pwo.actual_start_time, pwo.actual_end_time, pwo.status, pwo.tenant_id, pwo.plan_quantity, pwo.product_order_id, pwo.complete_quantity,
- ppm.device_id,
- ppm.device_name,
+ pp.device_id,
+ pp.device_name,
pp.NAME ,
pm.model,
pm.unit,
@@ -92,12 +98,9 @@
actual_start_time >= #{startDate}
AND actual_start_time <= #{endDate}
</select>
- <select id="selectMax" resultType="com.ruoyi.production.pojo.ProductWorkOrder">
- SELECT SUBSTRING(work_order_no, 3) as work_order_no
+ <select id="selectMax" resultType="java.lang.Integer">
+ SELECT count(1)
FROM product_work_order
- WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
- order by work_order_no desc
- limit 1
- ;
+ WHERE SUBSTRING(work_order_no, 3) like concat('%',#{datePrefix},'%')
</select>
</mapper>
--
Gitblit v1.9.3