From 8fb3ee9eae369f7a5c39da8ed69d0e8cea3ae2f8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 16:24:59 +0800
Subject: [PATCH] 生产加工单上显示图纸和图纸尺寸调整功能，流程卡上图纸尺寸调整功能

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 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 0e89cea..bcdbe7f 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
@@ -25,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);
@@ -74,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);
 
@@ -120,9 +120,12 @@
 
     Integer getPrintLabelCount(String processId, String technologyNumber);
 
-    List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+    List<Map<String, String>> selectReplenishPrintMp(String selectTime1, String selectTime2, FlowCard flowCard);
 
     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);
 
@@ -162,11 +165,16 @@
 
     List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber, Integer printQuantity);
 
+    List<Map<String, Object>> getgetPrintCustomDataSemiSp(String processId, String technologyNumber, Integer orderNumber);
+
     List<Map<String, String>> selectPrintNotMp(String orderId);
 
     List<Map<String, String>> selectPrintNotMergeMp(String orderId);
 
-    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);
+    List<Map<String, Object>> 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);
 
@@ -205,7 +213,9 @@
 
     List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);
 
-    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
+    List<Map<String, Object>> getPrintProjectDetailsMpSp(String projectNo,List<Integer> stockId);
+
+    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId,Integer polysId);
 
     List<Map<String, Object>> getPrintCustomDataProject(String projectNo);
 
@@ -279,4 +289,20 @@
 
     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);
+
+    Map<String, Object> getTerminationQuantity(String processId, Integer orderNumber);
+
+    Boolean updateTerminationStatus(String processId, Integer orderNumber);
+
+    Boolean updateTerminationNoMp(String processId, Integer orderNumber);
+
+    List<Map<String, Object>> getNewProcessMp(String processId, String orderNumber, String technologyNumber);
+
+    Map<String, Object> getProcessInfo( String processName);
+
+    List<Map<String, String>> OrderProcess();
+
+    List<Map<String, String>> PrintProgressProcessCardData(String startDate, String endDate);
 }

--
Gitblit v1.8.0