From f03aec1e60117209a32cd9b780f881c77dc07b67 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 15:16:51 +0800
Subject: [PATCH] 1、fixbug:原片仓出前后段入参形式不同导致后端接收不到入参报错 2、优化：钢化前/中空大理片笼新增字段是否相同：用于判断进片任务数据是否在笼内已存在玻璃，避免玻璃重复入库
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 24 +++++++++++++++++++++---
1 files changed, 21 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 5707047..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
@@ -1,16 +1,16 @@
package com.mes.damage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
+import com.mes.pp.entity.ReportingWork;
+import com.mes.pp.entity.ReportingWorkDetail;
import java.util.List;
-import java.util.Map;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author wu
@@ -20,7 +20,21 @@
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);
+
+ /**
+ * 鎸夌収鐜荤拑id淇℃伅鑷姩鎶ュ伐
+ *
+ * @param glassId
+ * @param deviceId
+ * @param workingProcedure
+ * @param remark
+ */
+ void autoSubmitReport(String glassId, int deviceId, String workingProcedure, String remark, int type);
/**
* 鍗曚釜鐮存崯
@@ -39,4 +53,8 @@
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