From 5cb362d364fa8582b2090e0d81585f4a7e9f19a1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:33:46 +0800
Subject: [PATCH] Merge branch 'dev_New' into jtwy
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 6e7e06c..b35349b 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -25,6 +25,7 @@
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
@@ -55,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,
@@ -76,4 +78,23 @@
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>
</mapper>
--
Gitblit v1.9.3