From e6bf567a863fb8a6bc7b776ac938825111c9ab52 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 14 十月 2024 08:54:07 +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 | 22 +++++++++++++++++++---
1 files changed, 19 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 e01f029..a7685d5 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,7 +9,7 @@
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, String reportType);
@@ -77,7 +77,23 @@
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();
+
+ List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess);
}
--
Gitblit v1.8.0