From b5a9dccccaf5bed064891a05ec8ff3f21de9cff0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 25 九月 2024 16:31:14 +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 | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 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 aefe9f3..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
@@ -1,8 +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.example.erp.entity.sd.OrderGlassDetail;
+import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.sql.Date;
@@ -10,22 +9,22 @@
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);
List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
- String SelectTechnologicalProcess(String processIdStr);
+ String SelectTechnologicalProcess(String processIdStr, String technologyStr);
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);
List<Map<String,String>> SelectProcessMp();
@@ -67,4 +66,32 @@
Boolean updateInventoryQuantity(String processId, Object orderNumber, Object technologyNumber, Object completedQuantity);
List<ReportingWork> selectReportingWorkMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
+
+ List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
+
+ Map<String, Integer> getQualityPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
+
+ Boolean updateQualityStatusMp(String reportingWorkId,String username);
+
+ List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);
+
+ Integer selectLayerByReportingWorkId(String reportingWorkId);
+
+ 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