From ab1bf3af4d7e9f5f07a2ebbef176b704ac68163d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 11 七月 2024 13:51:37 +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 | 12 +++++++++++-
1 files changed, 11 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 6e8d464..d9a9fb0 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
@@ -72,7 +72,7 @@
List<Map<String, String>> selectPrintMp(String orderId, FlowCard flowCard);
- List<Map<String, String>> getPrimaryList(String processId, Integer technologyNumber);
+ List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
@@ -83,6 +83,8 @@
Boolean updateComposing(String processId);
List<Map<String, String>> getPrintLabel(String projectNo);
+
+ List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);
@@ -103,4 +105,12 @@
List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber);
List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
+
+ Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
+
+ List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);
+
+ Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
+
+ List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
}
--
Gitblit v1.8.0