From 509742ccad07a353e92f17109de1f83431887414 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 17 二月 2025 15:51:00 +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 | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 cc5cd24..67ff14f 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,6 +1,7 @@
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;
@@ -38,13 +39,17 @@
* 鏇存柊涓婄墖琛ㄧ姸鎬�
*/
void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state);
+
/**
* 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩�
+ *
* @return UpPattenUsage
*/
- UpPattenUsage selectedEngineering(String engineeringId);
+ UpPattenUsage selectedTaskEngineering(String engineeringId);
+
/**
* 鏌ヨ姝ｅ湪鎵ц鐨勪笂鐗囦换鍔�
+ *
* @return UpPattenUsage
*/
UpPattenUsage selectOverTask();
@@ -56,10 +61,31 @@
/**
* 鏇存敼涓婄墖鐜荤拑鐘舵��
+ *
* @return UpPattenUsage
*/
Boolean updateGlassState(UpPattenUsage upPattenUsage);
- Object Engineering(Engineering request);
+ List<Engineering> setRawGlassTaskRequest(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(Integer i);
+
+ /**
+ * 鎷胯蛋:9/鐮存崯:8
+ *
+ * @param request
+ * @return
+ */
+ String identControls(DamageRequest request);
+
}
--
Gitblit v1.8.0