From 1b0d0c575638554a3ea616612c8b29552b1a5f21 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Tue, 17 Dec 2024 18:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nRecordReportExtDao.java => IMesProductionRecordReportExtDao.java} | 2 +-
 ...onRecordReportExtDao.java => MesProductionRecordReportExtDao.java} | 4 ++--
 .../serviceimpl/base/MesProductionRecordReportExtService.java         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/{IProductionRecordReportExtDao.java => IMesProductionRecordReportExtDao.java} (92%)
 rename modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/{ProductionRecordReportExtDao.java => MesProductionRecordReportExtDao.java} (98%)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IProductionRecordReportExtDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesProductionRecordReportExtDao.java
similarity index 92%
rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IProductionRecordReportExtDao.java
rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesProductionRecordReportExtDao.java
index 909e3ec..38f5001 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IProductionRecordReportExtDao.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/report/IMesProductionRecordReportExtDao.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @CreateDate : 2024/9/29 10:21
  * @Modify:
  **/
-public interface IProductionRecordReportExtDao {
+public interface IMesProductionRecordReportExtDao {
 
     ListPager<MesProductionRecordReportExtModel> queryProductionRecordUnionWorkOrderLogReport(MesProductionRecordReportExtModel model, Pager pager, List<Integer> reportStatusList);
 
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ProductionRecordReportExtDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesProductionRecordReportExtDao.java
similarity index 98%
rename from modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ProductionRecordReportExtDao.java
rename to modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesProductionRecordReportExtDao.java
index e2a1e55..47b6060 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ProductionRecordReportExtDao.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesProductionRecordReportExtDao.java
@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.apiservice.daoimpl.report;
 
-import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IProductionRecordReportExtDao;
+import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesProductionRecordReportExtDao;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
@@ -26,7 +26,7 @@ import java.util.List;
  * @Modify:
  **/
 @Service
-public class ProductionRecordReportExtDao implements IProductionRecordReportExtDao {
+public class MesProductionRecordReportExtDao implements IMesProductionRecordReportExtDao {
 
     @Autowired
     private EntityManager entityManager;
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordReportExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordReportExtService.java
index 068e4b9..3358019 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordReportExtService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductionRecordReportExtService.java
@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesProductionRecordReportExtService;
-import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IProductionRecordReportExtDao;
+import cn.estsh.i3plus.ext.mes.apiservice.dao.report.IMesProductionRecordReportExtDao;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesProductionRecordReportExtModel;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
@@ -24,7 +24,7 @@ import java.util.stream.Stream;
 public class MesProductionRecordReportExtService implements IMesProductionRecordReportExtService {
 
     @Autowired
-    private IProductionRecordReportExtDao productionRecordReportExtDao;
+    private IMesProductionRecordReportExtDao productionRecordReportExtDao;
 
     /**
      * 加工记录合并批量汇报查询报表