From e52411aebbba634949a0021553e8517b796f481e Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 12 六月 2025 16:26:08 +0800
Subject: [PATCH] Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into aerjiliya
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 6 ++++--
1 files changed, 4 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 67ff14f..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
@@ -66,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);
@@ -77,7 +79,7 @@
void deleteTask(String engineerId);
- List<UpPattenUsage> selectLoadTask(Integer i);
+ List<UpPattenUsage> selectLoadTask(Engineering engineering);
/**
* 鎷胯蛋:9/鐮存崯:8
--
Gitblit v1.8.0