From 7789318b8a9ef6535a0b776c5c0bfe2a8eb98e2b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 22 七月 2025 15:30:05 +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 | 4 ++++
1 files changed, 4 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 22d9e7e..83294b7 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
@@ -114,6 +114,10 @@
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, Integer> getWorkInProgressTotal(
// @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
--
Gitblit v1.8.0