From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 351d331..2c4f91a 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
@@ -165,6 +165,8 @@
List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
+ List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);
+
String selectUserMp(String userId);
List<Map<String, Object>> selectSortTableMp(String orderId);
@@ -177,7 +179,11 @@
List<Map<String, Object>> selectFlowCardMerge(String processId);
- Boolean updateFlowCardMerge(String processId);
+ Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);
Boolean deleteflowCardSort(String orderId, String processId);
+
+ List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
+
+ List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
}
--
Gitblit v1.8.0