From 6661232f32135d943c76197afba2baac81e171f4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 18 七月 2025 12:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 dc24e8a..52bbd13 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
@@ -8,7 +8,6 @@
import org.apache.ibatis.annotations.Param;
import java.sql.Date;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -31,7 +30,7 @@
List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2);
- 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 startDate,String endDate);
+ List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDatetime, String endDatetime, String step);
}
--
Gitblit v1.8.0