From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:16:18 +0800
Subject: [PATCH] art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java
index 15faed1..38d392d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java
@@ -1,11 +1,10 @@
package org.jeecg.modules.mdc.service;
-import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import org.jeecg.modules.mdc.dto.EquipmentMachingDto;
+import org.jeecg.modules.mdc.dto.MdcEquipmentDto;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* @author: LiuS
@@ -30,7 +29,7 @@
/**
* 鏌ヨ涓�娈垫椂闂村唴鐨勬暟鎹�
*/
- List<Map<String, Object>> findRunningData(String tableName, Date startTime, Date endTime);
+ List<String> findRunningData(String tableName, Date startTime, Date endTime);
/**
* 鏌ユ壘娉曞叞鍏嬭澶囪繍琛岀殑绋嬪簭鍙�
@@ -48,5 +47,13 @@
* @param productCount
* @return
*/
- MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount);
+ MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount, Date startTime, Date endTime);
+
+ /**
+ * 鏌ヨ娉曟媺鍏嬭澶囧姞宸ュ伐浠剁粨鏉熸椂闂�
+ * @param saveTableName
+ * @param productCount
+ * @return
+ */
+ MdcEquipmentDto findProductCountEndTime(String saveTableName, String productCount, Date startTime, Date endTime);
}
--
Gitblit v1.9.3