From 5bea1b3a23a1e68c2741ab32ffc89f67851ae2f8 Mon Sep 17 00:00:00 2001 From: 86158 <461356067@qq.com> Date: Tue, 27 Jan 2026 17:52:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A8=A1=E5=85=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dashboard/DashboardController.java | 6 +++--- .../admin/deviceledger/DeviceLedgerController.java | 2 +- .../deviceledger/DeviceLedgerServiceImpl.java | 2 +- .../mes/service/dvrepair/DvRepairService.java | 2 +- .../mes/service/dvrepair/DvRepairServiceImpl.java | 2 +- .../MoldTicketManagementServiceImpl.java | 13 +++++++------ .../ticketmanagement/TicketManagementService.java | 2 +- .../TicketManagementServiceImpl.java | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java index e435f6e6af..3196b48549 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java @@ -13,8 +13,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.vo.DeviceLedger import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanRespVO; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO; import cn.iocoder.yudao.module.mes.dal.dataobject.task.TaskDO; @@ -26,7 +26,7 @@ import cn.iocoder.yudao.module.mes.dal.mysql.ticketmanagement.TicketManagementMa import cn.iocoder.yudao.module.mes.service.deviceledger.DeviceLedgerService; import cn.iocoder.yudao.module.mes.service.deviceledger.DeviceLedgerServiceImpl; import cn.iocoder.yudao.module.mes.service.dvrepair.DvRepairService; -import cn.iocoder.yudao.module.mes.service.mold.MoldService; +import cn.iocoder.yudao.module.erp.service.mold.MoldService; import cn.iocoder.yudao.module.mes.service.moldrepair.MoldRepairService; import cn.iocoder.yudao.module.mes.service.moldticketmanagement.MoldTicketManagementService; import cn.iocoder.yudao.module.mes.service.organization.OrganizationService; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java index e4f3d6b52d..e9f475fc1a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.mes.controller.admin.deviceledger; -import cn.iocoder.yudao.module.erp.dal.dataobject.mold.MoldDO; +import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.mes.controller.admin.deviceledger.utils.ResumeNameUtils; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java index 459a33bd2b..7d131bc6a1 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductUnitDO; import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.mes.dal.mysql.devicetype.DeviceTypeMapper; -import cn.iocoder.yudao.module.mes.dal.mysql.mold.MesMoldMapper; +import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; import cn.iocoder.yudao.module.erp.dal.mysql.product.ErpProductMapper; import cn.iocoder.yudao.module.erp.service.product.ErpProductUnitService; import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanTypeEnum; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java index 4b6651784a..7e58b8a090 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairService.java @@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.Event import cn.iocoder.yudao.module.mes.controller.admin.dvrepair.vo.*; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import javax.validation.Valid; import java.util.List; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java index cb85f48b6e..5214bafc41 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java @@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.ticketresults.vo.TicketResul import cn.iocoder.yudao.module.mes.dal.dataobject.devicetype.DeviceTypeDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; import cn.iocoder.yudao.module.mes.dal.mysql.dvrepair.DvRepairLineMapper; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java index f1b953f0f3..56d61c8e6b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.service.moldticketmanagement; import cn.iocoder.yudao.module.common.dal.dataobject.mold.MoldDO; import cn.iocoder.yudao.module.common.dal.mysql.mold.MoldMapper; +import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.common.controller.admin.moldticketmanagement.enums.MoldPlanTypeEnum; import cn.iocoder.yudao.module.common.dal.dataobject.moldticketresults.MoldTicketResultsDO; @@ -147,28 +148,28 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ @Override public Long getBaoyangListCountByJobStatus() { - return moldticketManagementMapper.selectCount(Wrappers.lambdaQuery() + return moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getJobStatus, 0) .eq(MoldTicketManagementDO::getPlanType,2)); } @Override public Long getDianjianListCountByJobStatus() { - return moldticketManagementMapper.selectCount(Wrappers.lambdaQuery() + return moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getJobStatus, 0) .eq(MoldTicketManagementDO::getPlanType,1)); } @Override public List getListByJobStatus() { - return moldticketManagementMapper.selectList(Wrappers.lambdaQuery() + return moldTicketManagementMapper.selectList(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getJobStatus, 0)); } @Override public void selectCountMoldInspection(EventStatisticsVO eventStatisticsVO) { //模具点检 - int intValue = moldticketManagementMapper.selectCount(Wrappers.lambdaQuery() + int intValue = moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getPlanType, MoldPlanTypeEnum.INSPECTION.getCode()) .eq(MoldTicketManagementDO::getJobStatus,0)).intValue(); @@ -178,7 +179,7 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ @Override public void selectCountMoldMaintenance(EventStatisticsVO eventStatisticsVO) { //模具保养 - int intValue = moldticketManagementMapper.selectCount(Wrappers.lambdaQuery() + int intValue = moldTicketManagementMapper.selectCount(Wrappers.lambdaQuery() .eq(MoldTicketManagementDO::getPlanType, MoldPlanTypeEnum.MAINTENANCE.getCode()) .eq(MoldTicketManagementDO::getJobStatus,0)).intValue(); eventStatisticsVO.setMoldMaintenance(intValue); @@ -186,7 +187,7 @@ public class MoldTicketManagementServiceImpl implements MoldTicketManagementServ @Override public List getList() { - return moldticketManagementMapper.selectList(); + return moldTicketManagementMapper.selectList(); } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java index 95d4fa6886..73beb11a19 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementService.java @@ -5,7 +5,7 @@ import javax.validation.*; import cn.iocoder.yudao.module.mes.controller.admin.dashboard.vo.dashboard.EventStatisticsVO; import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldticketmanagement.MoldTicketManagementDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketmanagement.TicketManagementDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java index bf4deaf3c4..5912997e2b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.enums.PlanT import cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger.DeviceLedgerDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO; -import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO; +import cn.iocoder.yudao.module.common.dal.dataobject.moldrepair.MoldRepairDO; import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO; import cn.iocoder.yudao.module.mes.dal.mysql.deviceledger.DeviceLedgerMapper; import cn.iocoder.yudao.module.mes.dal.mysql.ticketresults.TicketResultsMapper;