From 57fca4f8e41c2504246459656cb3791621a039f0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 23 十月 2025 08:29:05 +0800
Subject: [PATCH] 1、报工查询界面改为分页 2、查询工程添加工程名称
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 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 80f141d..054022d 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,24 +1,71 @@
package com.mes.damage.service;
-import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.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
* @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);
+ Page<Damage> selectDamage(
+ String startTime,
+ String endTime,
+ int type,
+ int status,
+ String workingProcedure,
+ int pageNum, // 鏂板锛氬姩鎬侀〉鐮�
+ int pageSize // 鏂板锛氬姩鎬佹瘡椤垫潯鏁�
+ );
- 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);
- void insertDamage(String glassId);
+ 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);
+
+ /**
+ * 鍗曚釜鐮存崯
+ *
+ * @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, Boolean type);
}
--
Gitblit v1.8.0