From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IEquipmentWorkLineService.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 0208a23..15faed1 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
@@ -5,6 +5,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author: LiuS
@@ -19,5 +20,33 @@
/**
* 鏌ユ壘瑗块棬瀛愮被鍨嬭澶囪繍琛屾椂娈电殑璁惧绋嬪簭鍙�
*/
- List<EquipmentMachingDto> getEquipmentSequencenumber(String drivetype, String equipmentid, Date startTime, Date endTime);
+ List<EquipmentMachingDto> getEquipmentSequencenumber(String tableName, Date startTime, Date endTime);
+
+ /**
+ * 鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
+ */
+ Boolean isTableExist(String tableName);
+
+ /**
+ * 鏌ヨ涓�娈垫椂闂村唴鐨勬暟鎹�
+ */
+ List<Map<String, Object>> findRunningData(String tableName, Date startTime, Date endTime);
+
+ /**
+ * 鏌ユ壘娉曞叞鍏嬭澶囪繍琛岀殑绋嬪簭鍙�
+ * @param drivetype
+ * @param equipmentid
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<EquipmentMachingDto> getEquipProgramNum(String drivetype, String equipmentid, Date startTime, Date endTime);
+
+ /**
+ * 鏌ヨ娉曟媺鍏嬭澶囧姞宸ュ伐浠跺紑濮嬫椂闂�
+ * @param saveTableName
+ * @param productCount
+ * @return
+ */
+ MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount);
}
--
Gitblit v1.9.3