From bf84fec7d8dd5e7fbcc93030b8d83da7ec0ece91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 15:39:36 +0800
Subject: [PATCH] yys
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 6eea92a..48aa75b 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -25,8 +25,13 @@
pm.model,
pm.unit,
p.product_name AS productName,
+ pm.drawing_number,
po.nps_no AS productOrderNpsNo,
- ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus
+ 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
FROM
product_work_order pwo
LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -34,7 +39,7 @@
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
+ where pwo.status != 1
<if test="c.workOrderNo != null and c.workOrderNo != ''">
and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
</if>
@@ -51,6 +56,7 @@
pp.NAME as processName,
pm.model,
pm.unit,
+ pm.drawing_number,
p.product_name AS productName,
po.nps_no AS productOrderNpsNo,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
@@ -72,4 +78,57 @@
p.product_name,
po.nps_no
</select>
+ <select id="selectWorkOrderStartStats" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ SELECT
+ id,
+ actual_start_time AS planStartTime,
+ plan_quantity
+ FROM
+ product_work_order
+ WHERE
+ 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
+ FROM product_work_order
+ WHERE SUBSTRING(work_order_no, 3) like concat(#{datePrefix},'%')
+ order by work_order_no desc
+ limit 1
+ ;
+ </select>
+ <select id="getProductWorkOrderList" resultType="com.ruoyi.production.dto.ProductWorkOrderDto"
+ parameterType="com.ruoyi.production.dto.ProductWorkOrderDto">
+ SELECT
+ pwo.*,
+ pp.NAME as processName,
+ pm.model,
+ pm.unit,
+ p.product_name AS productName,
+ pm.drawing_number,
+ 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
+ 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>
+ <if test="c.workOrderNo != null and c.workOrderNo != ''">
+ and 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>
+ </select>
</mapper>
--
Gitblit v1.9.3