From bacec153f688bcee10795bd38f61b2406c20e488 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 24 九月 2024 16:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 43d1142..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
@@ -1,8 +1,10 @@
package com.mes.damage.service;
-import cn.hutool.core.date.DateTime;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.damage.entity.DamagePrint;
+import com.mes.pp.entity.ReportingWork;
+import com.mes.pp.entity.ReportingWorkDetail;
import java.util.List;
@@ -14,11 +16,37 @@
* @author wu
* @since 2024-06-13
*/
-public interface DamageService extends IService<Damage> {
+public interface DamageService extends MPJBaseService<Damage> {
- List<Damage> selectDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId);
+ List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure);
- void submitDamage(DateTime startTime, DateTime endTime, int type, int status, int workingProcedureId);
+ 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);
+
+ /**
+ * 鍗曚釜鐮存崯
+ *
+ * @param damage
+ */
void insertDamage(Damage damage);
+
+ /**
+ * 鎵归噺鐮存崯
+ *
+ * @param damageList
+ */
+ void batchInsertDamage(List<Damage> damageList);
+
+ 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