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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 2db2f77..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
@@ -122,17 +122,19 @@
List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
- List<Map<String, Object>> getDetailListRefund(String processId, Integer 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);
+ 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);
+ 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);
+ 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