From 731ab1ab578873d0374823fe0ca6f6928b50bd32 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 15 七月 2024 13:14:37 +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 26a4639..da45468 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
@@ -70,7 +70,7 @@
List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
- List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
+ List<Map<String, String>> selectPrintMp(String orderId);
List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
@@ -115,4 +115,6 @@
List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
List<Map<String, String>> selectorderOtherMoney();
+
+ List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
}
--
Gitblit v1.8.0