From 4ee53f8b43e850d2b35d5b1eb979d7b0bc2fbcd4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 五月 2024 10:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 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 0675066..97b7d75 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
@@ -1,17 +1,65 @@
package com.example.erp.mapper.pp;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.dto.pp.*;
+import com.example.erp.entity.pp.DamageDetails;
+import com.example.erp.entity.pp.Report;
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;
@Mapper
public interface ReportMapper {
- List<Map<String, String>> processCardProgressMp(String orderId, FlowCard flowCard);
+ List<Map<String, String>> processCardProgressMp(String orderId);
+
+ List<DamageDetails> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+
+ Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, DamageDetails damageDetails);
+
+ List<Map<String, String>> workInProgressMp(
+ @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
+ @Param("orderId") String orderId, @Param("inputProject") String inputProject,
+ @Param("selectProcesses") String selectProcesses, Report report);
+
+ List<Map<String, String>> processToBeCompletedMp(Date selectTime1, Date selectTime2, String orderId,
+ String inputProject, String selectProcesses, Report report);
+
+ List<DamageReportDTO> selectDamageReportMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);
+
+ 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<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);
+
+ Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);
+
+ List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);
+
+ List<OrderPlanDecompositionDTO> exportOrderPlanDecompositionMp(List<LocalDate> dates);
+
+ List<ProcessToBeCompletedDTO> exportProcessToBeCompletedMp(List<LocalDate> date, String process, String inputVal, String project);
+
+ List<WorkInProgressDTO> exportWorkInProgressMp(List<LocalDate> date, String process, String inputVal, String project);
+
+
+// Map<String, Integer> getWorkInProgressTotal(
+// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
+// @Param("orderId") String orderId, @Param("inputProject") String inputProject,
+// @Param("selectProcesses") String selectProcesses, Report report);
}
--
Gitblit v1.8.0