From 8891898a6ae6229ede66c8005f2912c75ddc6d90 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 三月 2025 22:32:26 +0800
Subject: [PATCH] 1、fixbug:中空任务领取部分对数玻璃后继续领任务，任务显示异常bug解决 2、大理片笼/中空理片笼显示异常bug:进片任务计算目标格子后，预先将笼子插入一条记录，界面相同判断时显示存在歧义，修改数据返回逻辑：在没有目标格子前提下，如果笼内存在玻璃显示相同，有目标格子后笼内有数据不显示 3、中空理片笼进片任务优化：中空可能存在脏数据，原因人为操作或订单多补片造成中空关系订单数量与实际数据不匹配，实际数量大于订单数量，系统会重新生成一份关系造成关系进笼玻璃数据顺序存在重复而无法进笼。
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
index 7c01553..0066379 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -1,7 +1,8 @@
package com.mes.engineering.service;
-import com.mes.engineering.entity.Engineering;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
@@ -16,13 +17,56 @@
public interface EngineeringService extends IService<Engineering> {
-
- boolean changeTask(String projectId, Integer state);
-
-
+ /**
+ * 寮�濮�/鏆傚仠浠诲姟
+ * @return boolean
+ */
+ boolean changeTask(String projectId, Integer state);
+ /**
+ * 鏌ヨ閽㈠寲淇℃伅
+ * @return List<Engineering>
+ */
List<Engineering> selectEngineering(String engineeringId);
- void saveEngineering(List<Engineering> engineerings);
+ /**
+ * 淇濆瓨閽㈠寲淇℃伅
+ */
+ void saveEngineering(List<Engineering> engineering);
+ /**
+ * 鏌ヨ鏄惁鏈変笂鐗囦换鍔�
+ *
+ * @return Engineering
+ */
Engineering selectInitiate(Integer state);
+ Engineering selectInitiates(Integer state,Integer cell);
+ /**
+ * 鏌ヨ宸ョ▼琛ㄦ槸鍚﹀凡鏈夊伐绋嬪彿
+ *
+ * @return Engineering
+ */
+ Engineering selectUpInitiate(String engineerId);
+
+ /**
+ * 鏌ヨ灏忕墖琛ㄦ槸鍚﹀凡鏈夊伐绋嬪彿
+ *
+ * @return Engineering
+ */
+ GlassInfo selectGlassinfoIsnull(String engineerId);
+ /**
+ * 鏌ヨ涓婄墖浠诲姟
+ *
+ * @return Engineering
+ */
+ List<Engineering> selectTask();
+
+ boolean pauseTask(String engineerId, Integer state);
+
+ boolean deleteTask(String engineerId);
+
+ boolean changeTasks(Engineering engineering);
+
+
+
+// boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell);
}
--
Gitblit v1.8.0