From d1f7ca24bfba95331f81f0b7a0d48739e6850262 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 20 九月 2024 15:49:14 +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, 7 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 db1b3b5..cfa07e3 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,12 +1,12 @@
 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;
+import com.mes.pp.entity.ReportingWork;
+import com.mes.pp.entity.ReportingWorkDetail;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -18,9 +18,11 @@
  */
 public interface DamageService extends MPJBaseService<Damage> {
 
-    List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
+    List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure);
 
     void submitDamage(List<Damage> damageList);
+
+    void submitReport(Damage damage);
 
     /**
      * 鍗曚釜鐮存崯
@@ -41,4 +43,6 @@
     List<DamagePrint> selectDamagePrintDetails(Damage damage);
 
     void deleteByGlassId(String glassId);
+
+    void sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
 }

--
Gitblit v1.8.0