diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java index 2301d4b4..ae535217 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java @@ -1,5 +1,9 @@ package com.op.device.controller; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.service.IDeviceInterfaceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,4 +17,17 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/deviceInterface") public class DeviceInterfaceController { + @Autowired + private IDeviceInterfaceService deviceInterfaceService; + + + /** + * 获取维修工单 + * @return + */ + @GetMapping("/getRepairWorkOrder") + public AjaxResult getRepairWorkOrder() { + return deviceInterfaceService.getRepairWorkOrder(); + } + } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/dto/InterfaceDTO.java b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InterfaceDTO.java new file mode 100644 index 00000000..c04ad3ff --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/dto/InterfaceDTO.java @@ -0,0 +1,5 @@ +package com.op.device.domain.dto; + +// 看板传参实体 +public class InterfaceDTO { +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/IRepairWorkOrderVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IRepairWorkOrderVO.java new file mode 100644 index 00000000..1151ebc6 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IRepairWorkOrderVO.java @@ -0,0 +1,6 @@ +package com.op.device.domain.vo; + +// 看板维修工单返回VO +public class IRepairWorkOrderVO { + +} 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 23a437fe..51604206 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 @@ -161,4 +161,10 @@ public interface EquOrderMapper { * @param orderIds */ void delEquOrderByOrderIds(String[] orderIds); + + /** + * 通过保养单Code修改保养单状态为已完成 + * @param repairCode + */ + void updateEquOrderStatusComplete(String repairCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java index 5bf97ee9..e8d22918 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java @@ -1,7 +1,15 @@ package com.op.device.service; +import com.op.common.core.web.domain.AjaxResult; + /** * 设备看板接口 */ public interface IDeviceInterfaceService { + + /** + * 获取维修工单 + * @return + */ + AjaxResult getRepairWorkOrder(); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 4806da53..1fe6f3c8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -1,11 +1,38 @@ package com.op.device.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquRepairWorkOrder; +import com.op.device.mapper.EquRepairWorkOrderMapper; import com.op.device.service.IDeviceInterfaceService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + +import static com.op.common.core.web.domain.AjaxResult.success; + /** * 看板接口实现类 */ @Service public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { + + @Autowired + private EquRepairWorkOrderMapper equRepairWorkOrderMapper; + + /** + * 获取维修工单 + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult getRepairWorkOrder() { + // 获取待维修的工单 + EquRepairWorkOrder workTemp = new EquRepairWorkOrder(); + workTemp.setWorkStatus("0"); + List workOrderList = equRepairWorkOrderMapper.selectEquRepairWorkOrderList(workTemp); +// EquRepairWorkOrder workOrder = equRepairWorkOrderMapper.selectWaitingWorkOrder(); + return success(workOrderList); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index c8777fcb..d224d32f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -160,11 +160,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { new LinkedBlockingQueue()); try { dateSources.forEach(dateSource -> { - if("ds_1000".equals(dateSource.get("poolName"))){//TODO生产去掉 - logger.info("++++++++++++" + dateSource.get("poolName") + "++++保养开始++++++++++"); - Runnable run = () -> createMaintenancePlanFunc(dateSource.get("poolName")); - executorService.execute(run); - } + logger.info("++++++++++++" + dateSource.get("poolName") + "++++保养开始++++++++++"); + Runnable run = () -> createMaintenancePlanFunc(dateSource.get("poolName")); + executorService.execute(run); }); } catch (Exception e) { logger.error("service == dataClearTask == exception", e); @@ -298,10 +296,10 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { sparePartsLedgerMapper.updateSpareNumReduce(apply); } - if(!CollectionUtils.isEmpty(spares)){ - sce = equOrderEquSpareMapper.insertEquOrderEquSpares(spares); - System.out.println(plan.getPlanCode()+"========equ_spare_apply:"+sce); - } +// if(!CollectionUtils.isEmpty(spares)){ +// sce = equOrderEquSpareMapper.insertEquOrderEquSpares(spares); +// System.out.println(plan.getPlanCode()+"========equ_spare_apply:"+sce); +// } /**equ_plan_detail->equ_order_detail*******************************************************/ @@ -348,12 +346,12 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); BeanUtils.copyProperties(plan,equOutsourceWork); equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); - equOutsourceWork.setOrderCode(orderCode); equOutsourceWork.setWorkCode(order.getOutsourceCode()); equOutsourceWork.setWorkType("1");//1委外保养0委外维修 equOutsourceWork.setCreateBy(createBy); equOutsourceWork.setCreateTime(nowtime); equOutsourceWork.setDelFlag("0"); + equOutsourceWork.setRepairCode(orderCode); sce = equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); System.out.println(plan.getPlanCode() + "========equ_outsource_work:" + sce); }else { diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java index e0755894..1bd1fcec 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java @@ -7,6 +7,7 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.EquRepairWorkOrder; +import com.op.device.mapper.EquOrderMapper; import com.op.device.mapper.EquRepairWorkOrderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +33,9 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { @Autowired private EquRepairWorkOrderMapper equRepairWorkOrderMapper; + @Autowired + private EquOrderMapper equOrderMapper; + /** * 查询委外工单 @@ -95,6 +99,8 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService { if(equOutsourceWork.getWorkStatus().equals("1")){ //更新维修工单状态 equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode()); + //更新保养工单状态 + equOrderMapper.updateEquOrderStatusComplete(equOutsourceWork.getRepairCode()); } equOutsourceWork.setUpdateTime(DateUtils.getNowDate()); equOutsourceWork.setUpdateBy(SecurityUtils.getUsername()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java index c695898a..c698a0c0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java @@ -142,7 +142,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService { } /** - * TODO 批量删除申领记录 + * 批量删除申领记录 * * @param applyIds 需要删除的申领记录主键 * @return 结果 diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml index 25c42457..b07e84e4 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml @@ -105,6 +105,7 @@ #{updateTime}, + insert into equ_order_equ_spare( id, order_code, material_code, material_desc, 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 770cf7a8..bede34e5 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 @@ -350,4 +350,12 @@ where order_id = #{orderId} + + update equ_order + set + order_status = '1' + where order_code = #{repairCode} + and del_flag = '0' + +