From cb05a90ebb7d71099a66fb03382cc93a4fa0a8ee Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 05 九月 2024 23:45:26 +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 | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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 3d836b2..fe0686d 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);
@@ -124,11 +126,11 @@
List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
- List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+ List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber);
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);
@@ -151,4 +153,26 @@
Integer printAddSortCountMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
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);
+
+ List<Map<String, Object>> selectFlowCardMerge(String processId);
+
+ Boolean updateFlowCardMerge(String processId);
+
+ Boolean deleteflowCardSort(String orderId, String processId);
}
--
Gitblit v1.8.0