From f00e9e5848711cbf735bf8d56be2a93cb7e850bf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 九月 2024 13:45:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 cfa07e3..d8ddacb 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,11 +18,11 @@
  */
 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);
 
     void submitDamage(List<Damage> damageList);
 
-    void submitReport(Damage damage);
+    Boolean submitReport(Damage damage);
 
     /**
      * 鍗曚釜鐮存崯
@@ -44,5 +44,5 @@
 
     void deleteByGlassId(String glassId);
 
-    void sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
+    Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
 }

--
Gitblit v1.8.0