From f4644873804165e9db88375f242421f00b0903f2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:36:01 +0800
Subject: [PATCH] 1、opc订阅断电重连功能已实现 2、移除lang包下定义字典重复字段

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 3d63695..0113b67 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
@@ -1,6 +1,5 @@
 package com.mes.damage.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
 import com.mes.damage.entity.Damage;
 import com.mes.damage.entity.DamagePrint;
@@ -8,7 +7,6 @@
 import com.mes.pp.entity.ReportingWorkDetail;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -20,11 +18,15 @@
  */
 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);
 
     void submitDamage(List<Damage> damageList);
 
-    void submitReport(Damage damage);
+    Boolean submitReport(Damage damage);
 
     /**
      * 鍗曚釜鐮存崯
@@ -46,5 +48,5 @@
 
     void deleteByGlassId(String glassId);
 
-    void sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
+    Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
 }

--
Gitblit v1.8.0