From 01d8334aaf05ff0ac0e4c0de3e43b4ee6d6fa73b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 09 八月 2024 10:39:52 +0800
Subject: [PATCH] 修改流程卡打印查询，补片流程卡同步流程卡的修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 70811b1..cf45204 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -274,7 +274,7 @@
itemmap.put("detailList", detailList);
}
else {
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess());
itemmap.put("detailList", detailList);
}
@@ -285,7 +285,7 @@
if (printLike.equals("")||printLike.equals("null") ){
itemmap.put("detail", flowCardMapper.getPrimaryListMerge(flowCard.getProcessId(), printMerge));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess());
itemmap.put("detailList", detailList);
}
else {
@@ -419,7 +419,7 @@
else{
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
list.add(itemmap);
}
}
--
Gitblit v1.8.0