From 05d6de25d55bdf1e2f3cde9d310c2cd14d59837a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 17 七月 2024 12:51:33 +0800
Subject: [PATCH] 提交

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   12 ++++++++++--
 1 files changed, 10 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 bcec497..9aa3216 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,9 +70,9 @@
 
     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, Integer technologyNumber);
+    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
 
     List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
 
@@ -111,4 +111,12 @@
     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);
+
+    List<Map<String, String>> selectorderOtherMoney();
+
+    List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+
+    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber);
 }

--
Gitblit v1.8.0