From 5ad6234b30f68ae65d6ffc345e874af09c56f4e3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 21 二月 2025 15:15:54 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index 69c8aa0..9a793da 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -1,5 +1,8 @@
package com.mes.uppattenusage.service;
+
import com.github.yulichang.base.MPJBaseService;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.engineering.entity.Engineering;
import com.mes.uppattenusage.entity.UpPattenUsage;
import java.util.List;
@@ -19,6 +22,11 @@
*/
List<UpPattenUsage> prioritylist();
/**
+ * 鏌ヨ涓婄墖琛ㄧ殑宸ョ▼淇℃伅
+ * @return List<UpPattenUsage>
+ */
+ List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage);
+ /**
* 鏌ヨ涓婄墖椤哄簭淇℃伅
* @return List<UpPattenUsage>
*/
@@ -31,13 +39,17 @@
* 鏇存柊涓婄墖琛ㄧ姸鎬�
*/
void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state);
+
/**
* 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩�
+ *
* @return UpPattenUsage
*/
- UpPattenUsage selectedEngineering(String engineeringId);
+ UpPattenUsage selectedTaskEngineering(String engineeringId);
+
/**
* 鏌ヨ姝ｅ湪鎵ц鐨勪笂鐗囦换鍔�
+ *
* @return UpPattenUsage
*/
UpPattenUsage selectOverTask();
@@ -47,5 +59,35 @@
*/
UpPattenUsage selectSequence(UpPattenUsage upPattenUsage);
+ /**
+ * 鏇存敼涓婄墖鐜荤拑鐘舵��
+ *
+ * @return UpPattenUsage
+ */
+ Boolean updateGlassState(UpPattenUsage upPattenUsage);
+
+ String setRawGlassTaskRequest(Engineering request);
+
+ String setRawGlassTaskRequest2(Engineering request);
+
+// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
+
+// UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);
+
+ UpPattenUsage selectedEngineering(String engineerId);
+
+ void deleteTask(String engineerId);
+
+
+ List<UpPattenUsage> selectLoadTask(Engineering engineering);
+
+ /**
+ * 鎷胯蛋:9/鐮存崯:8
+ *
+ * @param request
+ * @return
+ */
+ String identControls(DamageRequest request);
+
}
--
Gitblit v1.8.0