From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001 From: guoyujie <guoyujie@ng.com> Date: 星期四, 12 六月 2025 16:48:35 +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/sd/OrderProcessDetailMapper.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 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 0bb3382..8714e05 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 @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.sql.Date; import java.util.List; import java.util.Map; @@ -24,4 +25,12 @@ 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, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2); + + String selectNextProcess(String processId, String technologyNumber, String thisProcess); + + List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDatetime, String endDatetime, String step); } -- Gitblit v1.8.0