From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +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 | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 270762f..286703a 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,8 +1,8 @@
package com.example.erp.mapper.pp;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.OrderGlassDetail;
+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;
@@ -14,4 +14,21 @@
public interface ReportMapper {
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);
+
+// 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