From 7e3c4b0752700ce04be836bf65aea0d86a5922b3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 13:41:58 +0800
Subject: [PATCH] 返回状态信息
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 7 ++++++-
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 3 +++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 7a10f4a..d9b7ec0 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -61,4 +61,7 @@
@ApiModelProperty(value = "涓嶈壇鐜�")
private BigDecimal scrapRate;
+
+ @ApiModelProperty(value = "鐘舵�佹枃鏈�")
+ private String statusText;
}
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 8a4a5de..d105ba1 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -71,6 +71,11 @@
ROUND(sum(ppo.scrap_qty) / pwo.complete_quantity * 100, 2) AS scrapRate,
(pwo.complete_quantity - sum(ppo.scrap_qty)) AS completeQty,
CASE
+ WHEN pwo.complete_quantity >= pwo.plan_quantity THEN '宸茬敓浜�'
+ WHEN pwo.complete_quantity > 0 AND pwo.complete_quantity < pwo.plan_quantity THEN '鐢熶骇涓�'
+ ELSE '寰呯敓浜�'
+ END AS statusText,
+ CASE
WHEN pwo.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
ELSE '姝ｅ父'
END AS work_order_type
@@ -132,4 +137,4 @@
limit 1
;
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3