From dce5f099e76ecfa92ad708a3d5565a67844ceda2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 二月 2025 12:34:28 +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 |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 8224010..c7d0c18 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,6 +69,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);
 
@@ -86,6 +90,8 @@
     Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
 
     Boolean updateComposing(String processId);
+
+    Boolean updateProcessCardRack(String processId,String technologyNumber,String rack);
 
     List<Map<String, String>> getPrintLabel(String projectNo);
 
@@ -130,6 +136,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>> getDetailListMerge(String processId, String process);
 
     List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
 
@@ -190,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);
 
@@ -214,4 +223,12 @@
     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);
 }

--
Gitblit v1.8.0