From 1e6c537c6ae83a30fa3732939d16422ff2d105dd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 十二月 2025 09:22:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 92af08d..1e14ce1 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
@@ -12,11 +12,16 @@
public interface ReportingWorkMapper extends MPJBaseMapper<ReportingWork> {
- ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr, String previousProcess, String nextProcess, String process, String reportType);
+ ReportingWork AddSelectLastWorkMp(String processIdStr,
+ String technologyStr,
+ String previousProcess,
+ String nextProcess,
+ String process,
+ String reportType);
List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);
- List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
+ List<Map<String,String>> SelectWorkBasicTeamsMp(String process);
String SelectTechnologicalProcess(String processIdStr, String technologyStr);
@@ -24,7 +29,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();
@@ -44,7 +49,7 @@
int selectFlowCardNum(String orderNumber, String technologyNumber, String processId, String thisProcess);
- List<Map<String,Object>> selectByReportingWorkId(String reportingWorkId,String nextProcess);
+ List<Map<String,Object>> selectByReportingWorkId(String reportingWorkId,String nextProcess,String orderId);
Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
String selectNextProcess(String reportingWorkId);
@@ -65,11 +70,11 @@
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> selectReportingWorkMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, ReportingWork reportingWork);
- List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
+ List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, String selectTime1, String 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);
+ Map<String, Integer> getQualityPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, Integer state, String processId, ReportingWork reportingWork);
Boolean updateQualityStatusMp(String reportingWorkId,String username);
@@ -95,5 +100,19 @@
List<Map<String,String>> getSelectProcessDuoqu();
- List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess);
+ List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);
+
+ String getProcessLaminating(String process);
+
+ String selectOrderid(String processIdStr);
+
+ Map<String,Float> getFootSum(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, ReportingWork reportingWork);
+
+ Integer selectReviewedState(String reportingWorkId);
+
+ List<ReportingWork> qualityReviewSearchMp();
+
+ List<BasicDataProduce> mesSelectWorkBasicDeviceMp();
+
+ List<Map<String,String>> mesSelectWorkBasicTeamsMp();
}
--
Gitblit v1.8.0