From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 10 ++++++++++
1 files changed, 10 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..c33a6c5 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,12 @@
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);
+
+ List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2);
}
--
Gitblit v1.8.0