Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

委外保养定时任务逻辑修改

Browse Source
highway
wws 10 months ago
parent 170a3926a8
commit 8659dd8f11
11 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File

17
op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java
Unescape Escape View File

@ -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();
}
}

5
op-modules/op-device/src/main/java/com/op/device/domain/dto/InterfaceDTO.java
Unescape Escape View File

@ -0,0 +1,5 @@
package com.op.device.domain.dto;
// 看板传参实体
public class InterfaceDTO {
}

6
op-modules/op-device/src/main/java/com/op/device/domain/vo/IRepairWorkOrderVO.java
Unescape Escape View File

@ -0,0 +1,6 @@
package com.op.device.domain.vo;
// 看板维修工单返回VO
public class IRepairWorkOrderVO {
}

6
op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java
Unescape Escape View File

@ -161,4 +161,10 @@ public interface EquOrderMapper {
* @param orderIds
*/
void delEquOrderByOrderIds(String[] orderIds);
/**
* 通过保养单Code修改保养单状态为已完成
* @param repairCode
*/
void updateEquOrderStatusComplete(String repairCode);
}

8
op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java
Unescape Escape View File

@ -1,7 +1,15 @@
package com.op.device.service;
import com.op.common.core.web.domain.AjaxResult;
/**
* 设备看板接口
*/
public interface IDeviceInterfaceService {
/**
* 获取维修工单
* @return
*/
AjaxResult getRepairWorkOrder();
}

27
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
Unescape Escape View File

@ -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<EquRepairWorkOrder> workOrderList = equRepairWorkOrderMapper.selectEquRepairWorkOrderList(workTemp);
// EquRepairWorkOrder workOrder = equRepairWorkOrderMapper.selectWaitingWorkOrder();
return success(workOrderList);
}
}

18
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
Unescape Escape View File

@ -160,11 +160,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
new LinkedBlockingQueue<Runnable>());
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 {

6
op-modules/op-device/src/main/java/com/op/device/service/impl/EquOutsourceWorkServiceImpl.java
Unescape Escape View File

@ -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());

2
op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpareApplyServiceImpl.java
Unescape Escape View File

@ -142,7 +142,7 @@ public class EquSpareApplyServiceImpl implements IEquSpareApplyService {
}
/**
* TODO 批量删除申领记录
* 批量删除申领记录
*
* @param applyIds 需要删除的申领记录主键
* @return 结果

1
op-modules/op-device/src/main/resources/mapper/device/EquOrderEquSpareMapper.xml
Unescape Escape View File

@ -105,6 +105,7 @@
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<insert id="insertEquOrderEquSpares">
insert into equ_order_equ_spare(
id, order_code, material_code, material_desc,

8
op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
Unescape Escape View File

@ -350,4 +350,12 @@
where order_id = #{orderId}
</update>
<update id="updateEquOrderStatusComplete" parameterType="String">
update equ_order
set
order_status = '1'
where order_code = #{repairCode}
and del_flag = '0'
</update>
</mapper>

Write Preview
Loading…
Cancel
Save