From f0d8309e5637afbcd828dec33bb6faf620fe3102 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 七月 2024 11:58:11 +0800
Subject: [PATCH] 订单修改补跳转以及订单报表客户筛选

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 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 6e8d464..2e4cb03 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);
 
@@ -83,6 +83,8 @@
     Boolean updateComposing(String processId);
 
     List<Map<String, String>> getPrintLabel(String projectNo);
+
+    List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
 
     List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
 
@@ -103,4 +105,36 @@
     List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber);
 
     List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
+
+    Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
+
+    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);
+
+    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+
+    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+
+    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+
+    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+
+    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
+
+    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
 }

--
Gitblit v1.8.0