From 44504bd041f8dc3c97d1a9079c773a2f88b3d977 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 08 二月 2025 09:39:33 +0800
Subject: [PATCH] fix(datasource): 修改默认数据源名称和数据库名称

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 db1b3b5..bf90f72 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,12 +1,12 @@
 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>
@@ -20,8 +20,20 @@
 
     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);
     /**
      * 鍗曚釜鐮存崯
      *
@@ -41,4 +53,6 @@
     List<DamagePrint> selectDamagePrintDetails(Damage damage);
 
     void deleteByGlassId(String glassId);
+
+    Boolean sendToERP(ReportingWork reportingWork, List<ReportingWorkDetail> reportingWorkDetails);
 }

--
Gitblit v1.8.0