From c7da09314b249df0e516af98c3faa2f52ef79d50 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 16 七月 2025 17:57:12 +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 | 3 +--
1 files changed, 1 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 eb0dbfc..714560d 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;
@@ -113,7 +112,7 @@
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);
// Map<String, Integer> getWorkInProgressTotal(
--
Gitblit v1.8.0