From bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 03 Dec 2024 09:53:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
index fa6e846..d059fa0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.sg.mapper;
+import cn.gistack.sm.sg.DO.SgDeviceGxStepDO;
import cn.gistack.sm.sg.DO.SgGxStepDO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -21,4 +22,17 @@
List<SgGxStepDO> selectByGxInfoId(@Param("gxInfoId") Long gxInfoId);
List<SgGxStepDO> queryPageList(IPage<SgGxStepDO> page, @Param("dto") ProjectSearchDTO searchDTO);
+
+ /**
+ * 查询设备下的工序状态
+ * @param deviceId
+ * @return
+ */
+ List<SgDeviceGxStepDO> getDeviceGXList(@Param("deviceId") Long deviceId);
+
+ List<SgGxStepDO> queryStepList(@Param("deviceId")String deviceId);
+
+ List<SgGxStepDO> getDEviceGXtwo();
+
+ List<SgGxStepDO> queryStepLists(@Param("deviceType") String deviceType);
}
--
Gitblit v1.9.3