From f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 18:22:30 +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 | 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 ebf22f3..a87dfdc 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
@@ -69,6 +69,8 @@
List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
+ List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+
List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
@@ -81,7 +83,7 @@
Boolean updateComposing(String processId);
- List<Map<String, String>> getPrintLabel(String processId, Integer technologyNumber);
+ List<Map<String, String>> getPrintLabel(String projectNo);
List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
@@ -93,7 +95,7 @@
List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
- List<Order> getPrintCustomData(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getPrintCustomData(String processId, Integer technologyNumber);
Integer getPrintLabelCount(String processId, Integer technologyNumber);
}
--
Gitblit v1.8.0