From c69c4dd89ef52edcee896c6a9c150aa6c2809e84 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 二月 2025 13:55:39 +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 |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 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 b409ee8..0c6ed4d 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
@@ -40,6 +40,8 @@
     //鏌ヨ鎶ュ伐琛ㄥ唴鏄惁瀛樺湪瀵瑰簲娴佺▼鍗＄殑鏁版嵁
     Integer reportingWorkCount(String processId);
 
+    Integer reportingWorkCountByOrderId(String orderId);
+
     //鎻掑叆Flow_card琛�
     Boolean addFlowCardMp(String processId, Integer orderNumber, Integer landingSequence, Integer quantity, String productionId, String userName, Integer layer);
 
@@ -66,6 +68,7 @@
     List<Map<String, String>> flowCardDetailMp(String processId, FlowCard flowCard);
 
     Boolean deleteReportingWork(String processId);
+    Boolean deleteReportingWorkByOrderId(String orderId);
 
     List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard);
 
@@ -75,7 +78,11 @@
 
     List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process, String orderId);
 
+    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);
+
+    List<Map<String, Object>> getDetailLists(String processId, String technologyNumber, String process,Integer orderNumber);
 
     List<Map<String, Object>> getProcessList(String processId, String technologyNumber);
 
@@ -101,13 +108,15 @@
 
     List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);
 
-    List<Map<String, Object>>  getPrintCustomData(String processId, String technologyNumber);
+    List<Map<String, Object>>  getPrintCustomData(String processId, Integer orderNumber);
+
+    List<Map<String, Object>>  getPrintCustomData2(String processId);
 
     Integer getPrintLabelCount(String processId, String technologyNumber);
 
     List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
-    List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId);
+    List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
 
     List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);
 
@@ -124,6 +133,10 @@
     List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
     List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
+
+    List<Map<String, Object>> getDetailListMerge(String processId, String process);
+
+    List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
 
     List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber, String orderId);
 
@@ -147,7 +160,7 @@
 
     List<Map<String, String>> selectPrintNotMergeMp(String orderId);
 
-    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId);
+    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
 
     List<Map<String, String>> selectPrintAllMp(String orderId);
 
@@ -182,6 +195,7 @@
     Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);
 
     Boolean deleteflowCardSort(String orderId, String processId);
+    Boolean deleteflowCardSortByOrderId(String orderId);
 
     List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
 
@@ -198,4 +212,14 @@
     Boolean updateOrderProcessMp(String orderId, String number, String technologyNumber, String orderprocess);
 
     List<FlowCard> getFlowCardListPrintProject(String printProject);
+
+    Integer updateProjectLabelPrintCount(String projectNo);
+
+    Integer selectProjectLabelPrintCount(String projectNo);
+
+    Integer updateProjectProcessPrintCount(String projectNo);
+
+    Integer selectProjectProcessPrintCount(String projectNo);
+
+    int flowCardToOptimizeCount(String orderId);
 }

--
Gitblit v1.8.0