From aa3bd3741b94f50f0c1d7e3a137bb681d7421294 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 三月 2025 09:59:21 +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 |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 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 04c5fbf..7f8ff34 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
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.OrderDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,6 +41,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,8 +69,9 @@
     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);
+    List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
 
     List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
 
@@ -87,6 +91,8 @@
 
     Boolean updateComposing(String processId);
 
+    Boolean updateProcessCardRack(String processId,String technologyNumber,String rack);
+
     List<Map<String, String>> getPrintLabel(String projectNo);
 
     List<Map<String, String>> getPrintLabel2(String projectNo);
@@ -105,13 +111,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);
 
@@ -129,7 +137,9 @@
 
     List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
 
-    List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,Integer orderNumber,Integer quantity);
+    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);
 
@@ -153,7 +163,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);
 
@@ -188,6 +198,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);
 
@@ -204,4 +215,30 @@
     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);
+
+    List<Map<String, Object>> getFlowCardDetail(String processId);
+
+    Map<String,Object> getGlassThicknessByProdutionId(String orderId,String productionId);
+
+    List<OrderDetail>  getOrderDetailByProductionId(String orderId, String productionId);
+
+    Boolean revokeComposing(String processId);
+
+    Integer selectProjectNo(String processId);
+
+    List<Map<String, String>> selectPrintDetailsMp2(String orderId);
+
+    List<Map<String, Object>> getPrintOrderDataDetails(String orderId, Integer orderNumber, Integer printQuantity);
+
+    Boolean updatePrintNumberMp(String processId, Integer orderNumber);
 }

--
Gitblit v1.8.0