From 1d193f2cc23f54634ef8ed73c11436fbe76bb575 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 19 八月 2024 14:13:39 +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 | 18 +++++++++++++++++-
1 files changed, 17 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 6588ac0..2349e5c 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
@@ -84,6 +84,8 @@
List<Map<String, String>> getPrintLabel(String projectNo);
+ List<Map<String, String>> getPrintLabel2(String projectNo);
+
List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);
@@ -128,7 +130,7 @@
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>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
@@ -153,4 +155,18 @@
Boolean printUpdateSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);
+
+ List<Map<String, String>> selectPrintDetailsMp(String orderId);
+
+ List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
+
+ String selectUserMp(String userId);
+
+ List<Map<String, Object>> selectSortTableMp(String orderId);
+
+ String countFlowCard(String orderId);
+
+ List<Map<String, Object>> remakList(String processId);
+
+ List<Map<String, Object>> selectMaxFlowCard(String orderId, String productionId);
}
--
Gitblit v1.8.0