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 |    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