From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 17 ++++++++++++++++-
1 files changed, 16 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 8015f35..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,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;
@@ -65,7 +66,9 @@
*/
Boolean updateGlassState(UpPattenUsage upPattenUsage);
- List<Engineering> setRawGlassTaskRequest(Engineering request);
+ String setRawGlassTaskRequest(Engineering request);
+
+ String setRawGlassTaskRequest2(Engineering request);
// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
@@ -74,5 +77,17 @@
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