From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index 0113b67..dfd5bc6 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -18,8 +18,6 @@
  */
 public interface DamageService extends MPJBaseService<Damage> {
 
-    List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure);
-
     List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
 
 //    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
@@ -29,6 +27,14 @@
     Boolean submitReport(Damage damage);
 
     /**
+     * 鎸夌収鐜荤拑id淇℃伅鑷姩鎶ュ伐
+     * @param glassId
+     * @param deviceId
+     * @param workingProcedure
+     * @param remark
+     */
+    void autoSubmitReport(String glassId, int deviceId,String workingProcedure,String remark);
+    /**
      * 鍗曚釜鐮存崯
      *
      * @param damage

--
Gitblit v1.8.0