From 9d80c05bdbc18b4d7778828d411deb9b603f6a4b Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 25 七月 2025 15:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 1 +
1 files changed, 1 insertions(+), 0 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 a6cbc14..97a4c22 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
@@ -222,6 +222,7 @@
Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
new TypeReference<Map<String, String>>() {
});
+ dataList.get(i).put("reportWorkQuantityShow",dataList.get(i).get("reportWorkQuantity"));
for (String key : clos.keySet()) {
if(data.get(key) != null){
Integer max = orderGlassDetailMapper
--
Gitblit v1.8.0