From 30fd531c95ece1c0e7306cad138307dedd459d9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 二月 2025 08:49:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 4e06e76..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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.engineering.entity.Engineering;
+import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
@@ -40,13 +41,19 @@
Engineering selectInitiate(Integer state);
Engineering selectInitiates(Integer state,Integer cell);
/**
- * 鏌ヨ鏄惁鏈変笂鐗囦换鍔w
+ * 鏌ヨ宸ョ▼琛ㄦ槸鍚﹀凡鏈夊伐绋嬪彿
*
* @return Engineering
*/
- Engineering selectUpInitiate(Integer state, Integer equipmentId);
+ Engineering selectUpInitiate(String engineerId);
/**
+ * 鏌ヨ灏忕墖琛ㄦ槸鍚﹀凡鏈夊伐绋嬪彿
+ *
+ * @return Engineering
+ */
+ GlassInfo selectGlassinfoIsnull(String engineerId);
+ /**
* 鏌ヨ涓婄墖浠诲姟
*
* @return Engineering
--
Gitblit v1.8.0