From 939ccc9c254870ed15cdd485b9d303bbb00a23f2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 14:16:27 +0800
Subject: [PATCH] 注释加上上海玻璃公司ip

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   22 +++++++++++++++++++---
 1 files changed, 19 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 ecedcc1..eb30ad4 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
@@ -4,6 +4,7 @@
 import com.example.erp.dto.pp.FlowCardDTO;
 import com.example.erp.entity.pp.FlowCard;
 import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderProcessDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +25,7 @@
     Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
 
     //鍒嗘灦鏁版嵁鏌ヨ
-    List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+    List<FlowCard> selectFlowCardMp(String selectTime1, String selectTime2, FlowCard flowCard);
 
     //鍒嗘灦鏄庣粏鏌ヨ
     List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
@@ -73,9 +74,9 @@
     Boolean deleteReportingWork(String processId);
     Boolean deleteReportingWorkByOrderId(String orderId);
 
-    List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
+    List<Map<String, String>> selectPrintFlowCardMp(String selectTime1, String selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
 
-    List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+    List<Map<String, String>> selectPrintFlowCard(String selectTime1, String selectTime2);
 
     List<Map<String, String>> selectPrintMp(String orderId);
 
@@ -123,6 +124,9 @@
 
     List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
 
+    List<Map<String, Object>> getReworkPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+
     List<Map<String, Object>> getGlassNumber(String technologyNumber, String processId);
 
     Boolean updatePrintStateMp(Integer printState, String processId, String technologyNumber);
@@ -166,6 +170,9 @@
     List<Map<String, String>> selectPrintNotMergeMp(String orderId);
 
     List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
+    List<Map<String, String>> getReworkPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+
 
     List<Map<String, String>> selectPrintAllMp(String orderId);
 
@@ -271,4 +278,13 @@
     Boolean updateTerminationMp(String processId, Integer orderNumber, Integer value);
 
     Integer selectCompletedMp(String processId, Integer orderNumber, String interceptProcess);
+
+    String getProcessOk(String processId,String orderNumber, String technologyNumber);
+
+    List<OrderProcessDetail> getProcessDetail(String processId,String orderNumber, String technologyNumber, String process);
+
+    Boolean updateOrderProcessDetail(String processId, String orderNumber, Integer technologyNumber,
+                                     int reportingWorkNumCount, int reportingWorkNum, int brokenNum, String process);
+
+    List<Map<String, String>> getPrimaryListRefundHB(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId, String mergeTechnologyNumber, String patchReason, String orderId);
 }

--
Gitblit v1.8.0