From 6fac4cbed12a84473e8eab217abacc221dedca9f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 28 七月 2025 14:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 52bbd13..2123a09 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
@@ -26,9 +26,9 @@
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 orderNumber);
--
Gitblit v1.8.0