From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index ec5ea6a..48be7b7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -113,7 +113,7 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber);
+ List<Map<String, Object>> getPrintCustomData(String processId, Integer orderNumber, Integer printQuantity);
List<Map<String, Object>> getPrintCustomData2(String processId);
@@ -159,7 +159,7 @@
List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber);
List<Map<String, String>> selectPrintNotMp(String orderId);
@@ -261,4 +261,6 @@
List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound, String landingSequence);
List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
+
+ List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process);
}
--
Gitblit v1.8.0