From 950424e50bcd42cff0913fef387c537ba7dedfcc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 13:59:57 +0800
Subject: [PATCH] 修改流程卡分架界面落架顺序不正确问题,调整流程卡打印半径显示逻辑

---
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 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 c623215..abd36bf 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,9 +75,29 @@
 
     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);
 }

--
Gitblit v1.8.0