From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +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/pp/ReportingWorkMapper.java |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 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 c623215..ea1d274 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();
 
@@ -65,7 +65,7 @@
 
     Boolean updateInventoryQuantity(String processId, Object orderNumber, Object technologyNumber, Object completedQuantity);
 
-    List<ReportingWork> selectReportingWorkMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
+    List<ReportingWork> selectReportingWorkMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, ReportingWork reportingWork);
 
     List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
 
@@ -75,9 +75,35 @@
 
     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);
+    Boolean ReviewReportingWorkMp(String substring, String process, String result, String userName);
 
     String getPatchConditionMp(String reportingWorkId);
+
+    Integer getFirstStep(String processId, String orderSort, Integer technologyNumber, String interceptProcess);
+
+    Boolean updateReplenishWorkProcess(String processId, String orderSort, Integer technologyNumber, Integer patchNum, String patchProcesses);
+
+    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(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, ReportingWork reportingWork);
+
+    Integer selectReviewedState(String reportingWorkId);
+
+    List<ReportingWork> qualityReviewSearchMp();
 }

--
Gitblit v1.8.0