From 950424e50bcd42cff0913fef387c537ba7dedfcc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 13:59:57 +0800
Subject: [PATCH] 修改流程卡分架界面落架顺序不正确问题，调整流程卡打印半径显示逻辑

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   24 +++++++++++++++++++++---
 1 files changed, 21 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 56915b5..8224010 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
@@ -75,7 +75,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 +105,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 +130,8 @@
     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>> 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 +155,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);
 
@@ -196,4 +204,14 @@
     Boolean deleteProcessMp(String processId, String technologyNumber);
 
     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);
 }

--
Gitblit v1.8.0