From 8785b6b5ee9298308752b53bf546953ae49b8c88 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 09:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 14 +++++++++++---
1 files changed, 11 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 528b941..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
@@ -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>
@@ -20,7 +20,11 @@
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);
/**
* 鍗曚釜鐮存崯
@@ -36,7 +40,11 @@
*/
void batchInsertDamage(List<Damage> damageList);
- List<Damage> selectDamagePrint(Damage damage);
+ List<DamagePrint> selectDamagePrint(Damage damage);
List<DamagePrint> selectDamagePrintDetails(Damage damage);
+
+ void deleteByGlassId(String glassId);
+
+ Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
}
--
Gitblit v1.8.0