From 1e31f9f7fe6f04236e97f72c0df3ce051d5f867e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 24 十一月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index 14e87e4..39a31c0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -639,6 +639,10 @@
} else {
dataList = glassOptimizeMapper.directOptimization(projectNo);
}
+ List<Map<String, Object>> tempDataList = null;
+ if (Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1) {
+ tempDataList = glassOptimizeMapper.optimizeTemp(projectNo);
+ }
// 鑾峰彇纾ㄩ噺閰嶇疆鏁版嵁
List<Map<String, Object>> grindingTrimmingList = glassOptimizeMapper.getGrindingOptimize(username);
@@ -657,6 +661,9 @@
}
}
}
+ if (tempDataList != null && !tempDataList.isEmpty()) {
+ dataList.addAll(tempDataList);
+ }
map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
map.put("data", dataList);
map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
--
Gitblit v1.8.0