From 978c3b3b1f3b15e46fb4078f4aeb04e6d366f127 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 13:55:57 +0800
Subject: [PATCH] 返回合格数量
---
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 4 ++--
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 65e93c2..661eda4 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -33,6 +33,10 @@
@Excel(name = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty = BigDecimal.ZERO;
+ @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+ @Excel(name = "鍚堟牸鏁伴噺")
+ private BigDecimal qualifiedQty = BigDecimal.ZERO;
+
//浜у搧鍚嶇О
@Excel(name = "浜у搧鍚嶇О")
private String productName;
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 4ac2dce..875c2a1 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -64,8 +64,8 @@
ppo.quantity,
ppo.scrap_qty,
ppo.other_data,
- pm.unit,
- sl.sales_contract_no salesContractNo
+ (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
+ pm.unit
from
production_product_main ppm
left join product_work_order pwo on pwo.id = ppm.work_order_id
--
Gitblit v1.9.3