From a99c1f36e52c75e0020127c62d39c1eddae4a036 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 28 七月 2025 17:07:54 +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 | 14 ++++++++++++++
1 files changed, 14 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 bb54147..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
@@ -2,10 +2,12 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.sql.Date;
import java.util.List;
import java.util.Map;
@@ -19,4 +21,16 @@
List<Map<String,String>> filterOrderProcess(String orderId);
List<Map<String,Integer>> getGlassLRow(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, String orderId);
+
+ List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2, String orderId);
+
+ String selectNextProcess(String processId, String technologyNumber, String thisProcess, String orderNumber);
+
+ List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDatetime, String endDatetime, String step);
}
--
Gitblit v1.8.0