From aa5d2f68e1d97f7a1b20fa15e1bde9195544bb3e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 11 十一月 2025 15:15:06 +0800
Subject: [PATCH] 1、钢化查询添加显示工程名称 2、中空任务界面缺片详情修改
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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 528b941..f46bafc 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,16 +1,19 @@
package com.mes.damage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
+import com.mes.pp.entity.ReportingWork;
+import com.mes.pp.entity.ReportingWorkDetail;
+import com.mes.utils.Result;
import java.util.List;
-import java.util.Map;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author wu
@@ -18,9 +21,31 @@
*/
public interface DamageService extends MPJBaseService<Damage> {
- List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
+ Page<Damage> selectDamage(
+ String startTime,
+ String endTime,
+ int type,
+ int status,
+ String workingProcedure,
+ int pageNum, // 鏂板锛氬姩鎬侀〉鐮�
+ int pageSize // 鏂板锛氬姩鎬佹瘡椤垫潯鏁�
+ );
+
+// List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
void submitDamage(List<Damage> damageList);
+
+ Boolean submitReport(Damage damage);
+
+ /**
+ * 鎸夌収鐜荤拑id淇℃伅鑷姩鎶ュ伐
+ *
+ * @param glassId
+ * @param deviceId
+ * @param workingProcedure
+ * @param remark
+ */
+ void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type);
/**
* 鍗曚釜鐮存崯
@@ -36,7 +61,13 @@
*/
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, Boolean type);
+
+ List<Damage> queryUnTempByFlowCardId(String flowCardId);
}
--
Gitblit v1.8.0