From e7b7ffed9be4ce118d52e20a6f26a4ac9718eaef Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 05 三月 2025 16:46:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 813289a..469f1a9 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
@@ -24,7 +24,7 @@
List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);
- List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess);
+ List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);
List<Map<String,String>> SelectProcessMp();
@@ -75,7 +75,7 @@
List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);
- Integer selectLayerByReportingWorkId(String reportingWorkId);
+ String selectLayerByReportingWorkId(String reportingWorkId);
Boolean ReviewReportingWorkMp(String substring, String process, String result, String userName);
@@ -88,4 +88,18 @@
Boolean updateRWPatchNum(String reportingWorkId, Integer patchNum);
Boolean updateRWDPatchNum(String reportingWorkId, String orderSort, Integer technologyNumber, Integer patchNum);
+
+ String selectUserProcess(String userId);
+
+ List<Map<String,String>> getSelectProcessJiajiao();
+
+ List<Map<String,String>> getSelectProcessDuoqu();
+
+ List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);
+
+ String getProcessLaminating(String process);
+
+ String selectOrderid(String processIdStr);
+
+ Map<String,Float> getFootSum(Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
}
--
Gitblit v1.8.0