From c9cd6e47dbdf173060496f3d8ce0f228f6a17cda Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 30 七月 2026 17:56:18 +0800
Subject: [PATCH] 修改报工审批查询
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 63069a7..872d52f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -459,10 +459,28 @@
formConfig.put("summaryPlaceholder", "鎶ュ伐瀹℃壒");
formConfig.put("approvalType", "production_report");
+ ProductionOperationTask task = productionOperationTaskMapper.selectById(productionProductMain.getProductionOperationTaskId());
+ ProductionProductOutput output = productionProductOutputMapper.selectOne(
+ Wrappers.<ProductionProductOutput>lambdaQuery()
+ .eq(ProductionProductOutput::getProductionProductMainId, productionProductMain.getId())
+ .last("limit 1"));
+ BigDecimal schedulingNum = task == null ? BigDecimal.ZERO : defaultDecimal(task.getPlanQuantity());
+ BigDecimal finishedNum = output == null ? BigDecimal.ZERO : defaultDecimal(output.getQuantity());
+ BigDecimal scrapQty = output == null ? BigDecimal.ZERO : defaultDecimal(output.getScrapQty());
+ BigDecimal pendingNum = schedulingNum.subtract(finishedNum);
+ if (pendingNum.compareTo(BigDecimal.ZERO) < 0) {
+ pendingNum = BigDecimal.ZERO;
+ }
+
List<Map<String, Object>> fields = new ArrayList<>();
fields.add(buildReportField("productNo", "鎶ュ伐鍗曞彿", "text", productionProductMain.getProductNo()));
fields.add(buildReportField("userName", "鎶ュ伐浜哄憳", "text", productionProductMain.getUserName()));
+ fields.add(buildReportField("teamInfo", "鐝粍淇℃伅", "text", productionProductMain.getUserName()));
fields.add(buildReportField("workOrderNo", "宸ュ崟缂栧彿", "text", resolveWorkOrderNo(productionProductMain.getProductionOperationTaskId())));
+ fields.add(buildReportField("schedulingNum", "鎺掍骇鏁伴噺", "number", schedulingNum));
+ fields.add(buildReportField("pendingNum", "寰呯敓浜ф暟閲�", "number", pendingNum));
+ fields.add(buildReportField("finishedNum", "鐢熶骇鍚堟牸鏁伴噺", "number", finishedNum));
+ fields.add(buildReportField("scrapQty", "鎶ュ簾鏁伴噺", "number", scrapQty));
fields.add(buildReportField("reportType", "鎶ュ伐缁撴灉", "select", resolveReportTypeLabel(productionProductMain.getReportType())));
fields.add(buildReportField("workHour", "宸ユ椂", "number", productionProductMain.getWorkHour()));
fields.add(buildReportField("auditStatus", "瀹℃牳鐘舵��", "select", resolveAuditStatusLabel(productionProductMain.getAuditStatus())));
@@ -472,7 +490,12 @@
Map<String, Object> formPayload = new LinkedHashMap<>();
formPayload.put("productNo", productionProductMain.getProductNo());
formPayload.put("userName", productionProductMain.getUserName());
+ formPayload.put("teamInfo", productionProductMain.getUserName());
formPayload.put("workOrderNo", resolveWorkOrderNo(productionProductMain.getProductionOperationTaskId()));
+ formPayload.put("schedulingNum", schedulingNum);
+ formPayload.put("pendingNum", pendingNum);
+ formPayload.put("finishedNum", finishedNum);
+ formPayload.put("scrapQty", scrapQty);
formPayload.put("reportType", resolveReportTypeLabel(productionProductMain.getReportType()));
formPayload.put("workHour", productionProductMain.getWorkHour());
formPayload.put("auditStatus", resolveAuditStatusLabel(productionProductMain.getAuditStatus()));
@@ -811,13 +834,14 @@
&& productionProductMain.getAuditStatus() != null
&& productionProductMain.getAuditStatus() == 1
&& productionProductMain.getReportType() != null
- && productionProductMain.getReportType() == 0;
+ && (productionProductMain.getReportType() == 0 || productionProductMain.getReportType() == 1);
}
private boolean isExcludedFromWage(ProductionProductMain productionProductMain) {
return productionProductMain != null
&& productionProductMain.getReportType() != null
- && productionProductMain.getReportType() != 0;
+ && productionProductMain.getReportType() != 0
+ && productionProductMain.getReportType() != 1;
}
@Override
--
Gitblit v1.9.3