diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesEquipmentLogDetailService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesEquipmentLogDetailService.java
new file mode 100644
index 0000000..812c2e0
--- /dev/null
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesEquipmentLogDetailService.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.busi.report;
+
+import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLogDetail;
+
+/**
+ * @Description : 设备日志报表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2023/02/06 13:42
+ * @Modify:
+ **/
+public interface IMesEquipmentLogDetailService extends IBaseMesService<MesEquipmentLogDetail> {
+
+}
diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesWorkCellScanMonitorLogService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesWorkCellScanMonitorLogService.java
index cc55e25..b394a39 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesWorkCellScanMonitorLogService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/busi/report/IMesWorkCellScanMonitorLogService.java
@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.ext.mes.api.busi.report;
 
+import cn.estsh.i3plus.ext.mes.api.base.IBaseMesService;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
+import cn.estsh.i3plus.pojo.mes.bean.MesPackingDefineDetails;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellScanMonitorLog;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
@@ -13,7 +16,7 @@ import java.util.List;
  * @CreateDate : 2023/02/06 13:42
  * @Modify:
  **/
-public interface IMesWorkCellScanMonitorLogService {
+public interface IMesWorkCellScanMonitorLogService extends IBaseMesService<MesWorkCellScanMonitorLog> {
 
     /**
      * 查询工位扫描日志合并设备日志报表
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesEquipmentLogDetailController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesEquipmentLogDetailController.java
new file mode 100644
index 0000000..725d04f
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesEquipmentLogDetailController.java
@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
+
+import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController;
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLogDetail;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description :设备日志报表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2023/02/06 09:59
+ * @Modify:
+ **/
+@Api(tags = "设备日志报表")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentLogDetail")
+public class MesEquipmentLogDetailController extends BaseMesController<MesEquipmentLogDetail> {
+
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java
index 747bf61..08476c9 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesWorkCellScanMonitorLogController.java
@@ -1,11 +1,12 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.report;
 
 import cn.estsh.i3plus.ext.mes.api.busi.report.IMesWorkCellScanMonitorLogService;
+import cn.estsh.i3plus.ext.mes.apiservice.controller.base.BaseMesController;
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.impp.framework.base.controller.BaseController;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellScanMonitorLog;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -26,15 +27,15 @@ import java.util.List;
  * @CreateDate : 2023/02/06 09:59
  * @Modify:
  **/
-@RestController
-@RequestMapping(CommonConstWords.BASE_URL_MES)
 @Api(tags = "工位扫描日志合并设备日志报表")
-public class MesWorkCellScanMonitorLogController extends BaseController {
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellScanMonitorLog")
+public class MesWorkCellScanMonitorLogController extends BaseMesController<MesWorkCellScanMonitorLog> {
 
     @Autowired
     private IMesWorkCellScanMonitorLogService workCellScanMonitorLogService;
 
-    @GetMapping(value = "/ext/work-cell-scan-monitor-log/report/query")
+    @GetMapping(value = "/monitor-and-logdetail/report/query")
     @ApiOperation(value = "查询工位扫描日志合并设备日志报表")
     public ResultBean queryWorkCellScanMonitorLogList(MesWorkCellScanMonitorConditionModel conditionModel) {
         try {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java
new file mode 100644
index 0000000..d94faa3
--- /dev/null
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
+
+import cn.estsh.i3plus.ext.mes.api.busi.report.IMesEquipmentLogDetailService;
+import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
+import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentLogDetail;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MesEquipmentLogDetailService extends BaseMesService<MesEquipmentLogDetail> implements IMesEquipmentLogDetailService {
+
+    @Override
+    protected void setPackQueryBean(MesEquipmentLogDetail bean, DdlPackBean packBean) {
+        DdlPreparedPack.getNumEqualPack(bean.getEquipId(), MesExtConstWords.EQUIP_ID, packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getVariableType(), MesExtConstWords.VARIABLE_TYPE, packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), MesExtConstWords.EQUIPMENT_CODE, packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
+        DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
+    }
+
+}
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java
index 0e2c291..e853da3 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.report;
 
 import cn.estsh.i3plus.ext.mes.api.busi.report.IMesWorkCellScanMonitorLogService;
+import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.BaseMesService;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorConditionModel;
 import cn.estsh.i3plus.ext.mes.pojo.model.report.MesWorkCellScanMonitorLogModel;
@@ -31,7 +32,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogService {
+public class MesWorkCellMonitorLogService extends BaseMesService<MesWorkCellScanMonitorLog> implements IMesWorkCellScanMonitorLogService {
 
     @Autowired
     private MesWcEquipmentRepository wcEquipmentRepository;
@@ -73,7 +74,7 @@ public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogS
 
         if (StringUtils.isEmpty(conditionModel.getLimit())) MesException.throwBusiException("请输入查询数据量后进行查询!");
 
-        if (StringUtils.isEmpty(conditionModel.getCreateDatetimeStart()) || StringUtils.isEmpty(conditionModel.getCreateDatetimeEnd())) MesException.throwBusiException("请输入时间查询条件后进行查询!");
+        if (StringUtils.isEmpty(conditionModel.getCreateDateTimeStart()) || StringUtils.isEmpty(conditionModel.getCreateDateTimeEnd())) MesException.throwBusiException("请输入时间查询条件后进行查询!");
 
         if (StringUtils.isEmpty(conditionModel.getWorkCellCode()) && StringUtils.isEmpty(conditionModel.getEquipmentCode())) MesException.throwBusiException("请输入工位代码或者设备代码后进行查询!");
 
@@ -156,7 +157,7 @@ public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogS
         DdlPreparedPack.getNumEqualPack(conditionModel.getMouldRecordId(), MesExtConstWords.MOULD_RECORD_ID, packBean);
         DdlPreparedPack.getNumEqualPack(conditionModel.getMessageType(), MesExtConstWords.MESSAGE_TYPE, packBean);
         DdlPreparedPack.getInPackList(conditionModel.getLogTypeList(), MesExtConstWords.LOG_TYPE, packBean);
-        DdlPreparedPack.timeBuilder(conditionModel.getCreateDatetimeStart(), conditionModel.getCreateDatetimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
+        DdlPreparedPack.timeBuilder(conditionModel.getCreateDateTimeStart(), conditionModel.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
         DdlPreparedPack.getOrderByPack(new Object[]{conditionModel.getAscOrDesc()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
         List<MesWorkCellScanMonitorLog> workCellScanMonitorLogList = workCellScanMonitorLogRepository.findByHqlTopWhere(packBean, conditionModel.getLimit());
 
@@ -184,7 +185,7 @@ public class MesWorkCellMonitorLogService implements IMesWorkCellScanMonitorLogS
         DdlPreparedPack.getNumEqualPack(conditionModel.getEquipVariableId(), MesExtConstWords.EQUIP_VARIABLE_ID, packBean);
         DdlPreparedPack.getStringEqualPack(conditionModel.getEquipmentCode(), MesExtConstWords.EQUIPMENT_CODE, packBean);
         DdlPreparedPack.getStringLikerPack(conditionModel.getEquipVariableName(), MesExtConstWords.EQUIP_VARIABLE_NAME, packBean);
-        DdlPreparedPack.timeBuilder(conditionModel.getCreateDatetimeStart(), conditionModel.getCreateDatetimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
+        DdlPreparedPack.timeBuilder(conditionModel.getCreateDateTimeStart(), conditionModel.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, true);
         DdlPreparedPack.getOrderByPack(new Object[]{conditionModel.getAscOrDesc()}, new String[]{MesExtConstWords.CREATE_DATE_TIME}, packBean);
         List<MesEquipmentLogDetail> equipmentLogDetailList = equipmentLogDetailRepository.findByHqlTopWhere(packBean, conditionModel.getLimit());
 
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java
index 0104c6c..f06ac7f 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java
@@ -68,10 +68,10 @@ public class MesWorkCellScanMonitorConditionModel {
     private Integer ascOrDesc = CommonEnumUtil.ASC_OR_DESC.DESC.getValue();
 
     @ApiParam("查询时间起始")
-    private String createDatetimeStart;
+    private String createDateTimeStart;
 
     @ApiParam("查询时间截止")
-    private String createDatetimeEnd;
+    private String createDateTimeEnd;
 
     @ApiParam("日志类型")
     private List<Integer> logTypeList;