From cc80aa01b8efa26a2865d23fa9f3398f18247fcc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 24 九月 2024 09:06:31 +0800
Subject: [PATCH] 已转加工单禁用复选框

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 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 a3b96d3..d938427 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
@@ -74,7 +74,7 @@
 
     List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);
 
-    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
+    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber, String process);
 
     List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
 
@@ -83,6 +83,8 @@
     Boolean updateComposing(String processId);
 
     List<Map<String, String>> getPrintLabel(String projectNo);
+
+    List<Map<String, String>> getPrintLabel2(String projectNo);
 
     List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);
 
@@ -122,13 +124,13 @@
 
     List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
 
-    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
+    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
 
-    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, String patchReason);
 
     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);
 
@@ -136,7 +138,7 @@
 
     List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
+    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber, String process);
 
     List<Map<String, String>> selectPrintNotMp(String orderId);
 
@@ -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