From 134c875a7bd10c7054774b221deef16bdaab2078 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 11 七月 2024 10:29:12 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 bcec497..d9a9fb0 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
@@ -72,7 +72,7 @@
List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
- List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
+ List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
@@ -111,4 +111,6 @@
List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);
Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+
+ List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
}
--
Gitblit v1.8.0