From 296203344a6d3c0b7f9208960c89a6cb02d59ed9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 26 八月 2025 16:51:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 4c04559..b5c9183 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -23,6 +23,7 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.sql.Date;
+import java.sql.SQLOutput;
import java.time.LocalDate;
import java.util.*;
import java.util.function.Function;
@@ -159,12 +160,12 @@
//鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
//Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
- clos.put(uniqueList.get(i).get("process"), 16+i);
+ clos.put(uniqueList.get(i).get("process"), 14+i);
}
//鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
//Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
- columns.add(16+i);
+ columns.add(14+i);
}
}
@@ -193,10 +194,14 @@
});
//鍒ゆ柇鍚庡伐搴忔娴佺▼鍗″彿鏄惁鏈夋鐮�
List<DamageDetails> hasBreak = damageDetailsMapper
- .getNotReview(dataList.get(i).get("process_id"),
+ .getNotReview(dataList.get(i).get("processId"),
String.valueOf(dataList.get(i).get("order_number")),
String.valueOf(dataList.get(i).get("technology_number"))
);
+
+
+
+
if(!hasBreak.isEmpty()){
int finalI = i;
@@ -208,6 +213,7 @@
thisProcess,
orderId
);
+
if(behindProcess!=null &&!behindProcess.isEmpty()){
Integer behindDamageSum = damageDetailsMapper.getBehindDamageSum(
dataList.get(finalI).get("processId"),
--
Gitblit v1.8.0