From 6e87185c84d90e242ad93e47567c4b5e2be0c8d7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 10:38:53 +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/ReportMapper.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
index 286703a..cce4b65 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java
@@ -3,10 +3,12 @@
 
 import com.example.erp.entity.pp.DamageDetails;
 import com.example.erp.entity.pp.Report;
+import com.example.erp.entity.sd.Order;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.sql.Date;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +29,24 @@
     List<Map<String, String>> processToBeCompletedMp(Date selectTime1, Date selectTime2, String orderId,
                                                      String inputProject, String selectProcesses, Report report);
 
+    List<Map<String, String>> selectDamageReportMp(Date selectTime1, Date selectTime2, Report report);
+
+    List<Map<String, String>> splittingDetailsOutsideMp(String orderId, Report report);
+
+    List<Map<String, String>> qualityReportMp(Date selectTime1, Date selectTime2, Report report);
+
+    List<Map<String, String>> yieldMp(Date selectTime1, Date selectTime2, String selectProcesses, Report report);
+
+    List<Map<String, String>> productionScheduleMp(String orderId);
+
+    List<Map<String, String>> taskCompletionStatusMp(Date selectTime1, Date selectTime2);
+
+    List<Map<String, String>> orderPlanDecompositionMp(Date selectTime1, Date selectTime2, Report report);
+
+    List<Map<String, String>> rawMaterialRequisitionMp(Date selectTime1, Date selectTime2, Report report);
+
+    List<DamageDetails> exportCrossProcessBreakingMp(List<LocalDate> dates);
+
 //    Map<String, Integer> getWorkInProgressTotal(
 //                                                @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
 //                                                @Param("orderId") String orderId, @Param("inputProject") String inputProject,

--
Gitblit v1.8.0