From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java
index 8714e05..32aba77 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java
@@ -20,17 +20,20 @@
List<Map<String,String>> filterOrderProcess(String orderId);
- List<Map<String,Integer>> getGlassLRow(String orderId);
+ List<Map<String,Object>> getGlassLRow(String orderId);
+ List<Map<String,Object>> getProcessGlassLRow(String orderId);
List<Map<String, String>> filterLastProcess(String orderId, String orderNumber, String technologyNumber,String id);
void insertByReportingWorkDetail(ReportingWorkDetail reportingWorkDetail, String processId, String thisProcess);
- List<Map<String,String>> filterOrderProcessCollect(Date selectTime1, Date selectTime2);
+ List<Map<String,String>> filterOrderProcessCollect(Date selectTime1, Date selectTime2, String orderId);
- List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2);
+ List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2, String orderId);
- String selectNextProcess(String processId, String technologyNumber, String thisProcess);
+ String selectNextProcess(String processId, String technologyNumber, String thisProcess, String orderNumber);
List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDatetime, String endDatetime, String step);
+
+ String getBehindProcess(String processId, String orderNumber, String technologyNumber, String thisProcess,String orderId);
}
--
Gitblit v1.8.0