From 84e2a3ccb2e89128db849d30332a8daf142b4086 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 17 二月 2025 15:45:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
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 bf90f72..6522037 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
@@ -10,7 +10,7 @@
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author wu
@@ -28,12 +28,14 @@
/**
* 鎸夌収鐜荤拑id淇℃伅鑷姩鎶ュ伐
+ *
* @param glassId
* @param deviceId
* @param workingProcedure
* @param remark
*/
- void autoSubmitReport(String glassId, int deviceId,String workingProcedure,String remark,int type);
+ void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type);
+
/**
* 鍗曚釜鐮存崯
*
@@ -54,5 +56,5 @@
void deleteByGlassId(String glassId);
- Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
+ Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails, Boolean type);
}
--
Gitblit v1.8.0