From e9de57df1ef825a3f17b792e9110f24c407c03fb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 14 十月 2024 08:31:48 +0800
Subject: [PATCH] Merge branch 'hangzhou_master' of http://bore.pub:10439/r/HangZhouMes into hangzhou_master
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 3175d16..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
@@ -3,6 +3,8 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.pp.entity.ReportingWork;
+import com.mes.pp.entity.ReportingWorkDetail;
import java.util.List;
@@ -18,7 +20,13 @@
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);
+
+ Boolean submitReport(Damage damage);
/**
* 鍗曚釜鐮存崯
@@ -39,4 +47,6 @@
List<DamagePrint> selectDamagePrintDetails(Damage damage);
void deleteByGlassId(String glassId);
+
+ Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
}
--
Gitblit v1.8.0