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 c982cff2..a559228e 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 @@ -149,6 +149,7 @@ public class EquOrderServiceImpl implements IEquOrderService { List workCenters = equPlanMapper.selectWorkCenter(factory); + // 设置工作中心 for (EquOrder order : orderList) { for (WorkCenter center : workCenters) { if (center.getFactoryCode().equals(order.getPlanWorkshop())) { @@ -156,6 +157,11 @@ public class EquOrderServiceImpl implements IEquOrderService { } } order.setEquipmentName(equOrderMapper.selectEquipmentNameByEquCode(order.getEquipmentCode())); + // 设置计划名称 + String planName = equOrderMapper.selectPlanNameByPlanCode(order.getPlanCode()); + if (planName!=null) { + order.setPlanName(planName); + } } return orderList; } 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 3a437cbd..ec811201 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 @@ -106,6 +106,7 @@ and #{orderEndArrayEnd} >= CONVERT(date,order_end) and del_flag = '0' + order by create_time desc