From 43f0e69715099cfc8c8b8ea5284b874bfad14400 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 19 八月 2025 10:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/andon/service/IAndonResponseConfigService.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/service/IAndonResponseConfigService.java b/src/main/java/org/jeecg/modules/andon/service/IAndonResponseConfigService.java
index 58aa6bb..ff3ccd3 100644
--- a/src/main/java/org/jeecg/modules/andon/service/IAndonResponseConfigService.java
+++ b/src/main/java/org/jeecg/modules/andon/service/IAndonResponseConfigService.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.andon.dto.AndonButtonDTO;
+import org.jeecg.modules.andon.dto.AndonOrdeDto;
+import org.jeecg.modules.andon.entity.AndonOrder;
import org.jeecg.modules.andon.entity.AndonResponseConfig;
import java.util.List;
@@ -17,11 +19,34 @@
+ /**
+ * 鏍规嵁button_id鑾峰彇浜х嚎ID
+ * @param buttonId
+ * @return
+ */
+ String getProductionLineIdByButtonId(String buttonId);
+
+ /**
+ * 鏍规嵁button_id鑾峰彇鍝嶅簲浜�
+ * @param buttonId
+ * @return
+ */
+ String getResponderByButtonId(String buttonId,String factoryId);
+
+
+ /**
+ * 鏍规嵁button_id鍜宖actory_id鑾峰彇鍝嶅簲閰嶇疆瀵硅薄
+ * @param buttonId 鎸夐挳ID
+ * @param factoryId 宸ュ巶/浜х嚎ID
+ * @return AndonResponseConfig 鍝嶅簲閰嶇疆瀵硅薄
+ */
+ AndonResponseConfig getResponseConfigByButtonIdAndFactoryId(String buttonId, String factoryId);
+
/**
* 鍙戦�佸畨鐏�氱煡
* @param andonButtonDTO 瀹夌伅鎸夐挳DTO
* @return 缁撴灉
*/
- void sendAndonNotification(AndonButtonDTO andonButtonDTO);
+ void sendAndonNotification(AndonOrdeDto andonButtonDTO);
}
--
Gitblit v1.9.3