From a52b87449e493d4312cc81c33a4169eb6be3c144 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 09:14:19 +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 |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 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 8f183a6..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,10 +66,28 @@
       */
      Boolean updateGlassState(UpPattenUsage upPattenUsage);
 
-     List<Engineering> setRawGlassTaskRequest(Engineering request);
+     String setRawGlassTaskRequest(Engineering request);
 
-     List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
+     String setRawGlassTaskRequest2(Engineering request);
 
-     UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);
+//     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