From ab6ac91b7ed9ae3f9c68766f499ece11585c8859 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 30 六月 2025 08:56:20 +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 |   40 +++++++++++++++++++++++++++++++++-------
 1 files changed, 33 insertions(+), 7 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 1ec6d8c..45f14aa 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
@@ -1,7 +1,7 @@
 package com.example.erp.mapper.pp;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.erp.entity.pp.BasicDataProduce;
 import com.example.erp.entity.pp.ReportingWork;
+import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.sql.Date;
@@ -9,10 +9,10 @@
 import java.util.Map;
 
 @Mapper
-public interface ReportingWorkMapper extends BaseMapper<ReportingWork> {
+public interface ReportingWorkMapper extends MPJBaseMapper<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, String laminating);
 
     List<Map<String,String>> SelectProcessMp();
 
@@ -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, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
+
+    Integer selectReviewedState(String reportingWorkId);
+
+    List<ReportingWork> qualityReviewSearchMp();
 }

--
Gitblit v1.8.0