From 16bbf8260110e2790f304e8421cf7591837ca302 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 14 七月 2025 11:16:06 +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 | 18 +++++++++++++++---
1 files changed, 15 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 5b8ff8f..38fdee8 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
@@ -16,7 +16,7 @@
List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);
- List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
+ List<Map<String,String>> SelectWorkBasicTeamsMp(String process);
String SelectTechnologicalProcess(String processIdStr, String technologyStr);
@@ -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);
@@ -94,4 +94,16 @@
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(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
+
+ Integer selectReviewedState(String reportingWorkId);
+
+ List<ReportingWork> qualityReviewSearchMp();
}
--
Gitblit v1.8.0