From c069f2cce3c10a773e8c474c0031e316ffd8ad9e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 十一月 2025 10:57:02 +0800
Subject: [PATCH] 打印流程卡新增北玻logo

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 0b4cf51..a0099f2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -288,7 +288,15 @@
                 }
                 else{//灏忕墖鏍囩
                     Map<String, Object> itemmap = new HashMap<>();
-                    itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
+                    List<Map<String,Object>> customDataSemi =flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber());
+                    for (Map<String, Object> dataMap : customDataSemi) {
+                        dataMap.put("newList", flowCardMapper.getgetPrintCustomDataSemiSp(
+                                flowCard.getProcessId(),
+                                dataMap.get("technologyNumber").toString(),
+                                flowCard.getOrderNumber()
+                        ));
+                    }
+                    itemmap.put("data", customDataSemi);
                     list.add(itemmap);
                 }
 

--
Gitblit v1.8.0