From 215a413fa2bb598cc70c71a0c9691925f814f90b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 07 八月 2024 09:07:47 +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 | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 19b489f..1ec6d8c 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
@@ -18,7 +18,7 @@
List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);
- String SelectTechnologicalProcess(String processIdStr);
+ String SelectTechnologicalProcess(String processIdStr, String technologyStr);
String SelectWorkTechnologyMp(String processIdStr);
@@ -64,4 +64,20 @@
Integer selectCompletedQuantity(String reportingWorkId);
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 getPatchConditionMp(String reportingWorkId);
}
--
Gitblit v1.8.0