From 69a25cd577d5639f2869bcf80f498b373e80137e Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期三, 17 十二月 2025 10:43:44 +0800
Subject: [PATCH] 修改旋转逻辑，增加辅助旋转功能
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java | 10 +++++++---
1 files changed, 7 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 ea1d274..2acd2f1 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
@@ -44,7 +44,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);
@@ -67,9 +67,9 @@
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);
@@ -106,4 +106,8 @@
Integer selectReviewedState(String reportingWorkId);
List<ReportingWork> qualityReviewSearchMp();
+
+ List<BasicDataProduce> mesSelectWorkBasicDeviceMp();
+
+ List<Map<String,String>> mesSelectWorkBasicTeamsMp();
}
--
Gitblit v1.8.0