From 307cd7a9860c804eddd56465f0423efb950337dc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 25 七月 2025 14:16:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 eb0dbfc..d600a7f 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,7 +1,6 @@
package com.example.erp.mapper.pp;
-import cn.hutool.core.date.DateTime;
import com.example.erp.dto.pp.*;
import com.example.erp.entity.pp.Report;
import org.apache.ibatis.annotations.Mapper;
@@ -29,7 +28,7 @@
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<DamageReportDTO> selectDamageReportMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, DamageReportDTO damageReportDTO);
List<Map<String, String>> splittingDetailsOutsideMp(String orderId, Report report);
@@ -39,7 +38,7 @@
List<Map<String, String>> productionScheduleMp(String orderId);
- List<Map<String, String>> taskCompletionStatusMp(Date selectTime1, Date selectTime2);
+ List<Map<String, String>> taskCompletionStatusMp(Date selectTime1, Date selectTime2, String orderId);
List<Map<String, String>> orderPlanDecompositionMp(Date selectTime1, Date selectTime2, Report report);
@@ -49,7 +48,7 @@
List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);
- Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);
+ Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, DamageReportDTO damageReportDTO);
List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);
@@ -93,7 +92,7 @@
Map<String,Float> processToBeCompletedFootSum(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);
- Map<String,Float> damageReportFootSum(Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);
+ Map<String,Float> damageReportFootSum(String selectTime1, String selectTime2, DamageReportDTO damageReportDTO);
Map<String,Float> teamOutputFootSum(String selectTime1, String selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);
@@ -113,7 +112,15 @@
List<WorkInProgressDTO> workInProgressCombinationMpdataList1(Integer offset, Integer pageSize, String selectProcesses, WorkInProgressDTO workInProgressDTO);
- Map<String,Float> workInProgressCombinationOrderFootSum(Integer offset, Integer pageSize, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+ Map<String,Float> workInProgressCombinationOrderFootSum(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
+
+ List<Map<String, Object>> getWorkInProgressCombination(String process, String laminating, String optionVal);
+
+ List<String> selectProcess();
+
+ Map<String,Object> getWorkInProgressCombinationFootSum(String process, String laminating, String optionVal);
+
+ List<WorkInProgressCombinationDTO> exportWorkInProgressCombination(String process, String laminating, String inputVal);
// Map<String, Integer> getWorkInProgressTotal(
--
Gitblit v1.8.0