From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 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 9d571dd..ecedcc1 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
@@ -83,7 +83,7 @@
 
     List<Map<String, String>> getPrimaryLists(String processId, String technologyNumber, String glassChild, String process, String orderId,Integer quantity);
 
-    List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process, String flashback);
+    List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process, String flashback, String landingSequence);
 
     List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
 
@@ -113,7 +113,7 @@
 
     List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
 
-    List<Map<String, Object>>  getPrintCustomData(String processId, Integer orderNumber);
+    List<Map<String, Object>>  getPrintCustomData(String processId, Integer orderNumber, Integer printQuantity);
 
     List<Map<String, Object>>  getPrintCustomData2(String processId);
 
@@ -137,9 +137,9 @@
 
     List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
-    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process, String flashback);
+    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process, String flashback, String landingSequence);
 
-    List<Map<String, Object>> getDetailListMerge(String processId, String process, String flashback);
+    List<Map<String, Object>> getDetailListMerge(String processId, String process, String flashback, String landingSequence);
 
     List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
 
@@ -159,7 +159,7 @@
 
     List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
+    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
 
     List<Map<String, String>> selectPrintNotMp(String orderId);
 
@@ -257,4 +257,18 @@
     List<FlowCardDTO> exportDateProcessMp(List<LocalDate> date);
 
     Integer getSumQuantity(String orderId);
+
+    List<Map<String, Object>> getDetailCompoundList(String processId, String technologyNumber, String process, String flashback, String compound, String landingSequence);
+
+    List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
+
+    List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process, Integer printQuantity);
+
+    Integer getLayoutStatus(String processId);
+
+    List<Map<String, String>> selectSortingCardMp(String orderId, String productionId, String flashback, String optionVal, FlowCard flowCard);
+
+    Boolean updateTerminationMp(String processId, Integer orderNumber, Integer value);
+
+    Integer selectCompletedMp(String processId, Integer orderNumber, String interceptProcess);
 }

--
Gitblit v1.8.0