From 899813196f304b8e837f0dcff059b0110c82e110 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 16:07:38 +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 | 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 bf781f0..a511f19 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);
@@ -76,7 +79,30 @@
void deleteTask(String engineerId);
- List<UpPattenUsage> selectLoadTask(Integer i);
+ List<UpPattenUsage> selectLoadTask(Engineering engineering);
+ /**
+ * 鎷胯蛋:9/鐮存崯:8
+ *
+ * @param request
+ * @return
+ */
+ String identControls(DamageRequest request);
+
+ /**
+ * 寮�濮嬩笂鐗�
+ *
+ * @param quantity
+ * @param slot
+ * @return
+ */
+ Boolean insertTask(Integer quantity, Integer slot);
+
+ /**
+ * 鍒犻櫎浠诲姟
+ *
+ * @return
+ */
+ Boolean deleteUpPattenTask(String id);
}
--
Gitblit v1.8.0