From 994d01a5246199cd4f9f9c021625266f5ea6febc Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期五, 09 八月 2024 11:20:04 +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, 2 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 a3b96d3..3d836b2 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
@@ -74,7 +74,7 @@
List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);
- List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber, String process);
List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
@@ -136,7 +136,7 @@
List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
- List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
+ List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber, String process);
List<Map<String, String>> selectPrintNotMp(String orderId);
--
Gitblit v1.8.0