From 569c889395ebe14caf48820e7bfb0551357ec0d2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 九月 2025 08:59:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 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 48be7b7..d2bcfab 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);
 
@@ -159,7 +160,7 @@
 
     List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber);
+    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
 
     List<Map<String, String>> selectPrintNotMp(String orderId);
 
@@ -262,5 +263,22 @@
 
     List<Map<String, Object>> getDetailListLikeCompound(String processId, String s, String process, String flashback, String compound, String landingSequence);
 
-    List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process);
+    List<Map<String, Object>> getPrintCustomDataSemiTj(String processId, String technologyNumber, String process, Integer printQuantity);
+
+    Integer getLayoutStatus(String processId);
+
+    List<Map<String, String>> selectSortingCardMp(String orderId, String productionId, String flashback, String optionVal, FlowCard flowCard);
+
+    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