From fdb428a0221cd0a6a9ce96d4018b21ab0a0a4fa4 Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Thu, 6 Feb 2025 16:43:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6TAB=E6=A0=8F=E4=B8=AD=E7=9A=84=E2=80=9C=E7=82=B9?= =?UTF-8?q?=E6=A3=80=E2=80=9D=E2=80=9C=E4=BF=9D=E5=85=BB=E2=80=9D=E2=80=9C?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E2=80=9D=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dv/controller/DvCheckPlanController.java | 11 +++++++++ .../mes/dv/controller/DvRepairController.java | 10 ++++++++ .../ktg/mes/dv/domain/dto/DvCheckPlanDTO.java | 12 ++++++++++ .../ktg/mes/dv/domain/dto/DvRepairDTO.java | 10 ++++++++ .../mes/dv/mapper/DvCheckMachineryMapper.java | 8 +++++++ .../ktg/mes/dv/mapper/DvCheckPlanMapper.java | 4 ++++ .../com/ktg/mes/dv/mapper/DvRepairMapper.java | 10 ++++++++ .../dv/service/IDvCheckMachineryService.java | 7 ++++++ .../mes/dv/service/IDvCheckPlanService.java | 10 ++++++++ .../ktg/mes/dv/service/IDvRepairService.java | 10 ++++++++ .../impl/DvCheckMachineryServiceImpl.java | 5 ++++ .../service/impl/DvCheckPlanServiceImpl.java | 23 +++++++++++++++++++ .../dv/service/impl/DvRepairServiceImpl.java | 13 +++++++++++ .../mapper/dv/DvCheckMachineryMapper.xml | 6 ++++- .../resources/mapper/dv/DvCheckPlanMapper.xml | 10 +++++++- .../resources/mapper/dv/DvRepairMapper.xml | 4 ++++ 16 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvCheckPlanDTO.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvRepairDTO.java diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java index 04e957d..4827ea6 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java @@ -7,6 +7,7 @@ import cn.hutool.core.collection.CollUtil; import com.ktg.common.constant.UserConstants; import com.ktg.mes.dv.domain.DvCheckMachinery; import com.ktg.mes.dv.domain.DvCheckSubject; +import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO; import com.ktg.mes.dv.service.IDvCheckMachineryService; import com.ktg.mes.dv.service.IDvCheckSubjectService; import org.springframework.security.access.prepost.PreAuthorize; @@ -150,4 +151,14 @@ public class DvCheckPlanController extends BaseController return toAjax(dvCheckPlanService.deleteDvCheckPlanByPlanIds(planIds)); } + + /** + * 根据设备编码和计划类型查询设备点检计划头列表 + * @return + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkplan:list')") + @GetMapping("/getCheckPlan") + public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) { + return dvCheckPlanService.getCheckPlan(checkPlanDTO); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvRepairController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvRepairController.java index 6dfb94e..851ddba 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvRepairController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvRepairController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; +import com.ktg.mes.dv.domain.dto.DvRepairDTO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -109,4 +110,13 @@ public class DvRepairController extends BaseController { return toAjax(dvRepairService.deleteDvRepairByRepairIds(repairIds)); } + + /** + * 根据设备编码查询设备维修单列表 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:repair:list')") + @GetMapping("/getRepairList") + public AjaxResult getRepairList(DvRepairDTO repairDTO) { + return dvRepairService.getRepairList(repairDTO); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvCheckPlanDTO.java b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvCheckPlanDTO.java new file mode 100644 index 0000000..e32f745 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvCheckPlanDTO.java @@ -0,0 +1,12 @@ +package com.ktg.mes.dv.domain.dto; + +import lombok.Data; + +@Data +public class DvCheckPlanDTO { + + private String planType; + + private String machineryCode; + +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvRepairDTO.java b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvRepairDTO.java new file mode 100644 index 0000000..f4f229c --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvRepairDTO.java @@ -0,0 +1,10 @@ +package com.ktg.mes.dv.domain.dto; + +import lombok.Data; + +@Data +public class DvRepairDTO { + + private String machineryCode; + +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java index eb51f9b..0ff8e53 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java @@ -2,6 +2,7 @@ package com.ktg.mes.dv.mapper; import java.util.List; import com.ktg.mes.dv.domain.DvCheckMachinery; +import org.apache.ibatis.annotations.Param; /** * 点检设备Mapper接口 @@ -67,4 +68,11 @@ public interface DvCheckMachineryMapper * @return */ public int deleteByPlanId(Long planId); + + /** + * 根据设备编码获取相关计划id + * @param machineryCode + * @return + */ + List getPlanId(@Param("machineryCode") String machineryCode); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckPlanMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckPlanMapper.java index cf15d22..2817111 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckPlanMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckPlanMapper.java @@ -2,6 +2,8 @@ package com.ktg.mes.dv.mapper; import java.util.List; import com.ktg.mes.dv.domain.DvCheckPlan; +import org.apache.ibatis.annotations.Param; +import org.springframework.security.core.parameters.P; /** * 设备点检计划头Mapper接口 @@ -60,4 +62,6 @@ public interface DvCheckPlanMapper * @return 结果 */ public int deleteDvCheckPlanByPlanIds(Long[] planIds); + + List getByIds(@Param("planIds") List planIds,@Param("planType") String planType); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvRepairMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvRepairMapper.java index fe508b1..ed5d5aa 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvRepairMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvRepairMapper.java @@ -1,7 +1,9 @@ package com.ktg.mes.dv.mapper; import java.util.List; + import com.ktg.mes.dv.domain.DvRepair; +import org.apache.ibatis.annotations.Param; /** * 设备维修单Mapper接口 @@ -61,4 +63,12 @@ public interface DvRepairMapper * @return 结果 */ public int deleteDvRepairByRepairIds(Long[] repairIds); + + /** + * 根据设备编码查询设备维修单列表 + * + * @param machineryCode + * @return + */ + List getRepairList(@Param("machineryCode") String machineryCode); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java index 2529dd9..5382a1d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java @@ -67,4 +67,11 @@ public interface IDvCheckMachineryService * @return */ public int deleteByPlanId(Long planId); + + /** + * 根据设备编码获取相关计划id + * @param machineryCode + * @return + */ + List getPlanId(String machineryCode); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckPlanService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckPlanService.java index daad349..8a592da 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckPlanService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckPlanService.java @@ -1,7 +1,10 @@ package com.ktg.mes.dv.service; import java.util.List; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.mes.dv.domain.DvCheckPlan; +import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO; /** * 设备点检计划头Service接口 @@ -65,4 +68,11 @@ public interface IDvCheckPlanService * @return 结果 */ public int deleteDvCheckPlanByPlanId(Long planId); + + /** + * 根据设备编码和计划类型查询设备点检计划头列表 + * @return + */ + AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO); + } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvRepairService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvRepairService.java index 8a1c0cb..c474f4f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvRepairService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvRepairService.java @@ -1,7 +1,10 @@ package com.ktg.mes.dv.service; import java.util.List; + +import com.ktg.common.core.domain.AjaxResult; import com.ktg.mes.dv.domain.DvRepair; +import com.ktg.mes.dv.domain.dto.DvRepairDTO; /** * 设备维修单Service接口 @@ -65,4 +68,11 @@ public interface IDvRepairService * @return 结果 */ public int deleteDvRepairByRepairId(Long repairId); + + /** + * 根据设备编码查询设备维修单列表 + * @param repairDTO + * @return + */ + AjaxResult getRepairList(DvRepairDTO repairDTO); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java index b9da8fe..9780882 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java @@ -111,4 +111,9 @@ public class DvCheckMachineryServiceImpl implements IDvCheckMachineryService public int deleteByPlanId(Long planId) { return dvCheckMachineryMapper.deleteByPlanId(planId); } + + @Override + public List getPlanId(String machineryCode) { + return dvCheckMachineryMapper.getPlanId(machineryCode); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java index c75988d..45cafce 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java @@ -3,8 +3,12 @@ package com.ktg.mes.dv.service.impl; import java.util.List; import com.ktg.common.constant.UserConstants; +import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.utils.DateUtils; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO; +import com.ktg.mes.dv.service.IDvCheckMachineryService; +import org.aspectj.weaver.loadtime.Aj; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.dv.mapper.DvCheckPlanMapper; @@ -23,6 +27,9 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService @Autowired private DvCheckPlanMapper dvCheckPlanMapper; + @Autowired + private IDvCheckMachineryService dvCheckMachineryService; + /** * 查询设备点检计划头 * @@ -106,4 +113,20 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService { return dvCheckPlanMapper.deleteDvCheckPlanByPlanId(planId); } + + /** + * 根据设备编码和计划类型查询设备点检计划头列表 + * @return + */ + @Override + public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) { + // 根据设备编码获取相关计划id + List planIds = dvCheckMachineryService.getPlanId(checkPlanDTO.getMachineryCode()); + if (planIds != null && planIds.size() > 0) { + // 根据设备编码和计划类型获取相关设备点检计划头列表 + List list = dvCheckPlanMapper.getByIds(planIds, checkPlanDTO.getPlanType()); + return AjaxResult.success(list); + } + return AjaxResult.success(); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvRepairServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvRepairServiceImpl.java index 50ee650..6aabd67 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvRepairServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvRepairServiceImpl.java @@ -3,8 +3,10 @@ package com.ktg.mes.dv.service.impl; import java.util.List; import com.ktg.common.constant.UserConstants; +import com.ktg.common.core.domain.AjaxResult; import com.ktg.common.utils.DateUtils; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.dv.domain.dto.DvRepairDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.dv.mapper.DvRepairMapper; @@ -106,4 +108,15 @@ public class DvRepairServiceImpl implements IDvRepairService { return dvRepairMapper.deleteDvRepairByRepairId(repairId); } + + /** + * 根据设备编码查询设备维修单列表 + * @param repairDTO + * @return + */ + @Override + public AjaxResult getRepairList(DvRepairDTO repairDTO) { + List list = dvRepairMapper.getRepairList(repairDTO.getMachineryCode()); + return AjaxResult.success(list); + } } diff --git a/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml index 14b4f34..fe518da 100644 --- a/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml +++ b/ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml @@ -55,7 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where plan_id = #{planId} ) limit 1 - + + insert into dv_check_machinery diff --git a/ktg-mes/src/main/resources/mapper/dv/DvCheckPlanMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvCheckPlanMapper.xml index 1e509f1..c95e12e 100644 --- a/ktg-mes/src/main/resources/mapper/dv/DvCheckPlanMapper.xml +++ b/ktg-mes/src/main/resources/mapper/dv/DvCheckPlanMapper.xml @@ -52,7 +52,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where plan_code = #{planCode} - + + insert into dv_check_plan diff --git a/ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml index ca8d843..8cb3631 100644 --- a/ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml +++ b/ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml @@ -66,6 +66,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where repair_code = #{repairCode} limit 1 + insert into dv_repair