From 85741906046ab01e6b824e7e306a1f332c25f2f4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 十二月 2024 17:33:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 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 8aec501..56915b5 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
@@ -45,7 +45,7 @@
 
     Boolean updateFlowState(String productionId, Integer orderNumber);
 
-    Integer selectFlowCount(String productionId);
+    Integer selectFlowCount(String orderId);
 
 
     Boolean updateProcessingCard(String productionId, int state);
@@ -73,7 +73,7 @@
 
     List<Map<String, String>> selectPrintMp(String orderId);
 
-    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);
+    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process, String orderId);
 
     List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);
 
@@ -117,7 +117,7 @@
 
     Boolean printOrderSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort);
 
-    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);
+    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber, String orderId);
 
     List<Map<String, String>> selectorderOtherMoney();
 
@@ -125,19 +125,19 @@
 
     List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
 
-    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
+    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber, String orderId);
 
     List<Map<String, Object>> getDetailListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String patchReason);
 
-    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason);
+    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
 
     List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
+    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String orderId);
 
     List<Map<String, Object>> getDetailListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
+    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber, String orderId);
 
     List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
 
@@ -157,7 +157,7 @@
 
     Boolean printUpdateSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);
 
-    List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);
+    List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process, String orderId);
 
     List<Map<String, String>> selectPrintDetailsMp(String orderId);
 
@@ -186,4 +186,14 @@
     List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
 
     List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
+
+    List<Map<String, Object>> getPrintCustomDataProject(String projectNo);
+
+    List<Map<String, String>> getPrintLabel3(String projectNo);
+
+    Boolean updateProcessMp(String processId, String technologyNumber, String process, String number);
+
+    Boolean deleteProcessMp(String processId, String technologyNumber);
+
+    Boolean updateOrderProcessMp(String orderId, String number, String technologyNumber, String orderprocess);
 }

--
Gitblit v1.8.0