From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 8 +++++---
1 files changed, 5 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..4e5ec39 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,13 @@
*/
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);
/**
* 鍗曚釜鐮存崯
@@ -44,5 +46,5 @@
void deleteByGlassId(String glassId);
- void sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
+ Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
}
--
Gitblit v1.8.0