From 0c86561c023aa79914aa1f494b2a91ad5c38b38f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 十一月 2025 08:14:22 +0800
Subject: [PATCH] 1、报工查询添加显示宽，高
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 dfd5bc6..6644013 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,20 @@
package com.mes.damage.service;
+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.damage.entity.dto.DamageDTO;
+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;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author wu
@@ -18,7 +22,15 @@
*/
public interface DamageService extends MPJBaseService<Damage> {
- List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
+ Page<DamageDTO> 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);
@@ -28,12 +40,14 @@
/**
* 鎸夌収鐜荤拑id淇℃伅鑷姩鎶ュ伐
+ *
* @param glassId
* @param deviceId
* @param workingProcedure
* @param remark
*/
- void autoSubmitReport(String glassId, int deviceId,String workingProcedure,String remark);
+ void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type);
+
/**
* 鍗曚釜鐮存崯
*
@@ -54,5 +68,7 @@
void deleteByGlassId(String glassId);
- Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
+ Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails, Boolean type);
+
+ List<Damage> queryUnTempByFlowCardId(String flowCardId);
}
--
Gitblit v1.8.0