From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 0d60d59..1da9784 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
@@ -330,6 +330,7 @@
String processSub = flowCard.getProcess().split("->")[0];
//鑾峰彇宸ュ簭瀵瑰簲鐨勫埆绉�
String processName = flowCardMapper.getProcessName(processSub);
+ //processName.equals("stepC") || processName.equals("stepD")
if (processName.equals("stepC") || processName.equals("stepD")) {//宸ヨ壓鏄惁鍖呭惈澶硅兌涓┖
itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(),
String.valueOf("null".equals(compound)
@@ -689,14 +690,14 @@
flowCard.getProcessId(),
flowCard.getTechnologyNumber(),
flowCard.getProcess(),
- flowCard.getOrderNumber()
+ flowCard.getOrderNumber(), flowCard.getPrintQuantity()
));
} else {
-
+ //鐢ㄤ簬澶╂触鐜板満娴佺▼鍗℃墦鍗扮晫闈㈢殑灏忕墖鏍囩鎵撳嵃
itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
flowCard.getProcessId(),
flowCard.getTechnologyNumber(),
- flowCard.getProcess()
+ flowCard.getProcess(), flowCard.getPrintQuantity()
));
}
list.add(itemmap);
@@ -734,7 +735,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
@@ -951,7 +952,7 @@
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber()));
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
list.add(itemmap);
}
}
--
Gitblit v1.8.0