From 215a413fa2bb598cc70c71a0c9691925f814f90b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 07 八月 2024 09:07:47 +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, 4 insertions(+), 0 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 2cee2e4..aee9ae3 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
@@ -139,4 +139,8 @@
List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
List<Map<String, String>> selectPrintNotMp(String orderId);
+
+ List<Map<String, String>> selectPrintNotMergeMp(String orderId);
+
+ List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, Integer technologyNumber, String reportingWorkId);
}
--
Gitblit v1.8.0