From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +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 | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 8714e05..e0ee1b5 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,6 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.erp.dto.sd.OrderProcessSortDTO;
import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import org.apache.ibatis.annotations.Mapper;
@@ -20,17 +21,24 @@
List<Map<String,String>> filterOrderProcess(String orderId);
- List<Map<String,Integer>> getGlassLRow(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);
+ List<Map<String,String>> filterOrderProcessCollect(Date selectTime1, Date selectTime2, String orderId);
- List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2);
+ List<Map<String, Integer>> getGlassLRowCollect(Date selectTime1, Date selectTime2, String orderId);
- 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 startDatetime, String endDatetime, String step);
+
+ String getBehindProcess(String processId, String orderNumber, String technologyNumber, String thisProcess,String orderId);
+
+ List<OrderProcessDetail> selectProcessCardProgressSv(String orderId, String processId, String orderNumber, String technologyNumber, String process);
+
+ List<OrderProcessSortDTO> selectProcessSort(String orderId, String processId, String orderNumber, String technologyNumber);
}
--
Gitblit v1.8.0