From 761aa895b2955a13a8d3d56405336404bca18451 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 七月 2024 11:58:22 +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 | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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..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);
@@ -111,4 +111,30 @@
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