From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 cf3289e..32aba77 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,11 +2,14 @@
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;
@Mapper
@DS("sd")
@@ -14,4 +17,23 @@
boolean insertOrderProcessDetail(@Param("processDetailList") List<OrderProcessDetail> processDetailList);
void updateQuantity(String reportingWorkId,String process,String type);
+
+ List<Map<String,String>> filterOrderProcess(String orderId);
+
+ List<Map<String,Object>> getGlassLRow(String orderId);
+ List<Map<String,Object>> getProcessGlassLRow(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);
+
+ String getBehindProcess(String processId, String orderNumber, String technologyNumber, String thisProcess,String orderId);
}
--
Gitblit v1.8.0