From de18cca83738bdf6b279046e34b910ccd5b73a84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:17:50 +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 | 11 ++++++++---
1 files changed, 8 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 a383476..a893ed4 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,4 +1,5 @@
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.example.erp.entity.pp.ReportingWorkDetail;
@@ -10,7 +11,7 @@
import java.util.Map;
@Mapper
-public interface ReportingWorkMapper {
+public interface ReportingWorkMapper extends BaseMapper<ReportingWork> {
ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr,String previousProcess,String nextProcess,String process);
@@ -23,7 +24,7 @@
String SelectWorkTechnologyMp(String processIdStr);
- List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr);
+ List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr,String process);
List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String previousProcess);
@@ -33,7 +34,11 @@
List<Map<String,String>> historyDeviceMp(String historyProcess, String process);
- List<Map<String,String>> historyTeamsMp(String historyProcess, String process);
+ List<Map<String,String>> historyTeamsMp(String processIdStr, String process);
List<Map<String,String>> SelectHistoryProcessMp(String historyProcess, String process);
+
+ List<Map<String,BasicDataProduce>> selectBasicNameByType(String type);
+
+ Integer selectMaxReportingWorkId();
}
--
Gitblit v1.8.0