From e5beb189d8b8a544f3763e5090ea6084639d46e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 八月 2024 09:55:05 +0800
Subject: [PATCH] 打印显示批次，和筛选问题

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 2db2f77..f487359 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
@@ -72,13 +72,13 @@
 
     List<Map<String, String>> selectPrintMp(String orderId);
 
-    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber);
+    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);
 
     List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber);
 
     List<Map<String, Object>> getProcessList(String processId, Integer technologyNumber);
 
-    Boolean updateInventory(String processId, String orderNumber, String technologyNumber, int completedQuantity);
+    Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);
 
     Boolean updateComposing(String processId);
 
@@ -102,7 +102,7 @@
 
     List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
 
-    List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber);
+    List<Map<String, Object>> getRepairPrintCustomData(String processId, Integer technologyNumber, String reportingWorkId);
 
     List<Map<String, Object>> getGlassNumber(Integer technologyNumber, String processId);
 
@@ -122,17 +122,23 @@
 
     List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);
 
-    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber);
+    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);
+    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
 
-    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber);
+    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);
 
     List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
 
-    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber);
+    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
 
     List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);
 
-    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber);
+    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);
+
+    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
+
+    List<Map<String, String>> selectPrintNotMp(String orderId);
+
+    List<Map<String, String>> selectPrintNotMergeMp(String orderId);
 }

--
Gitblit v1.8.0