From 560d3dff2f22e88b8bddb5e1346b5393368d2c1c Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 16 Nov 2023 14:26:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87-=E5=B7=A5=E5=8D=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/device/domain/EquOrder.java | 20 ++++++++++++++++ .../com/op/device/mapper/EquOrderMapper.java | 6 +++++ .../service/impl/EquOrderServiceImpl.java | 23 ++++++++++--------- .../impl/EquUpkeepOrderServiceImpl.java | 18 +++------------ .../impl/InspectionWorkServiceImpl.java | 6 ++--- .../mapper/device/EquOrderMapper.xml | 6 +++-- 6 files changed, 47 insertions(+), 32 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index c1ac1c74..259e990e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -152,6 +152,26 @@ public class EquOrder extends BaseEntity { private String equipmentName; private String planRestrict; + private List detailList; + + private List spareList; + + public List getSpareList() { + return spareList; + } + + public void setSpareList(List spareList) { + this.spareList = spareList; + } + + public List getDetailList() { + return detailList; + } + + public void setDetailList(List detailList) { + this.detailList = detailList; + } + public String getPlanRestrict() { return planRestrict; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 6e251af6..d26f7fa0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -120,4 +120,10 @@ public interface EquOrderMapper { */ List selectTodayTask(PDADTO pdadto); + /** + * 通过设备编码查询设备名称 + * @param equipmentCode + * @return + */ + String selectEquipmentNameByEquCode(String equipmentCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index 73dea7cb..fc87c149 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -70,23 +70,28 @@ public class EquOrderServiceImpl implements IEquOrderService { timeArray.add(order.getOrderStart()); timeArray.add(order.getOrderEnd()); order.setTimeArray(timeArray); + // 设置设备名称 + order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode())); + // 设置计划名称 order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(order.getPlanCode())); + // 工作中心（车间） order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByOrderCode(order.getOrderCode()); - - List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId()); + // 检查项 + List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); for (EquOrderDetail detail : detailList) { + // 标准 List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); detail.setStandardList(standardList); } - equ.setDetailList(detailList); + order.setDetailList(detailList); - List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByParentCode(equ.getId()); + // 备件 + List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode()); if (spareList.size() > 0) { - equ.setSpareList(spareList); + order.setSpareList(spareList); } // 人员信息 @@ -100,8 +105,6 @@ public class EquOrderServiceImpl implements IEquOrderService { order.setPersonList(personList); - order.setEqu(equ); - return order; } @@ -116,9 +119,7 @@ public class EquOrderServiceImpl implements IEquOrderService { public List selectEquOrderList(EquOrder equOrder) { List orderList = equOrderMapper.selectEquOrderList(equOrder); for (EquOrder order : orderList) { - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByOrderCode(order.getOrderCode()); - order.setEquipmentCode(equ.getEquipmentCode()); - order.setEquipmentName(equ.getEquipmentName()); + order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode())); } return orderList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java index 88c2c84c..fe20e5f8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java @@ -102,22 +102,12 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { equOrder.setUpdateBy(SecurityContextHolder.getUserName()); equOrder.setUpdateTime(DateUtils.getNowDate()); equOrder.setPlanType("maintenance"); + equOrder.setEquipmentCode(equPlan.getEquipmentItem().get(0).getEquipmentCode()); // 工单插入数据库 equOrderMapper.insertEquOrder(equOrder); - // 生成工单-设备 - EquOrderEqu equ = new EquOrderEqu(); - List equPlanEquList = equPlan.getEquipmentItem(); - EquPlanEqu equPlanEqu = equPlanEquList.get(0); - BeanUtils.copyProperties(equPlanEqu,equ); - equ.setId(IdUtils.fastSimpleUUID()); - equ.setParentCode(equOrder.getOrderId()); - equ.setOrderCode(equOrder.getOrderCode()); - equ.setFactoryCode(factory); - equ.setAttr1(""); - equ.setCreateBy(SecurityContextHolder.getUserName()); - // 设备插入 - equOrderEquMapper.insertEquOrderEqu(equ); + EquPlanEqu equPlanEqu = equPlan.getEquipmentItem().get(0); + // 生成工单-备件 List spareList = new ArrayList<>(); List equSpareList = equPlanEqu.getSpareList(); @@ -127,7 +117,6 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { BeanUtils.copyProperties(spare,spareTemp); spareTemp.setId(IdUtils.fastSimpleUUID()); spareTemp.setOrderCode(equOrder.getOrderCode()); - spareTemp.setParentCode(equ.getId()); spareTemp.setFactoryCode(factory); spareTemp.setCreateBy(SecurityContextHolder.getUserName()); spareTemp.setCreateTime(DateUtils.getNowDate()); @@ -149,7 +138,6 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { BeanUtils.copyProperties(detail,equOrderDetail); equOrderDetail.setId(IdUtils.fastSimpleUUID()); equOrderDetail.setOrderCode(equOrder.getOrderCode()); - equOrderDetail.setParentCode(equ.getId()); equOrderDetail.setFactoryCode(factory); equOrderDetail.setStandardList(orderStandardList); equOrderDetail.setCreateBy(SecurityContextHolder.getUserName()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java index 0ea5cffb..c1430e2b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java @@ -62,12 +62,10 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { // 替换循环周期 order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType())); - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByOrderCode(order.getOrderCode()); - - Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equ.getEquipmentCode()); + Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(order.getEquipmentCode()); // 查询检查项、标准 - List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId()); + List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); for (EquOrderDetail detail : detailList) { List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); for (EquOrderStandard standard : standardList) { diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index d298c2f1..6394d68f 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -139,6 +139,10 @@ ) + + insert into equ_order @@ -178,7 +182,6 @@ repair_code, work_code, plan_restrict, - shut_down, #{orderId}, @@ -216,7 +219,6 @@ #{repairCode}, #{workCode}, #{planRestrict}, - #{shutDown},