From b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 16:30:18 +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 |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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..5b8ff8f 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
@@ -77,7 +77,21 @@
 
     Integer 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();
 }

--
Gitblit v1.8.0