From b85a2ab202e1da68ca1e532a783dc0f5685dad3b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 八月 2024 23:43:40 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
index 889e8d3..e01f029 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java
@@ -12,7 +12,7 @@
public interface ReportingWorkMapper extends BaseMapper<ReportingWork> {
- ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr,String previousProcess,String nextProcess,String process);
+ ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr, String previousProcess, String nextProcess, String process, String reportType);
List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);
@@ -22,9 +22,9 @@
String SelectWorkTechnologyMp(String processIdStr);
- List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr,String process);
+ List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);
- List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process);
+ List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess);
List<Map<String,String>> SelectProcessMp();
@@ -76,4 +76,8 @@
List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);
Integer selectLayerByReportingWorkId(String reportingWorkId);
+
+ Boolean ReviewReportingWorkMp(String substring, String process, String result);
+
+ String getPatchConditionMp(String reportingWorkId);
}
--
Gitblit v1.8.0