Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备模块功能更新

Browse Source
master
Yangwl 3 weeks ago
parent 646839e774
commit d54bedc1a1
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -581,6 +581,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
equRepairOrder.setRepairDestination("立即维修");
equRepairOrderMapper.insertEquRepairOrder(equRepairOrder);
String code = equRepairOrder.getOrderCode().substring(10);
//审核报修单据，生成维修单
@ -591,11 +592,12 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode()); //报修单号
equRepairWorkOrder.setWorkCode("WX" + workCode); //维修单号
equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode()); //设备编码
equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam()); //维修组
equRepairWorkOrder.setWorkTeam("机修"); //维修组
equRepairWorkOrder.setWorkOutsource("0"); //不委外
equRepairWorkOrder.setOutWorkCode("无"); //无委外工单号
equRepairWorkOrder.setWorkHandle("1"); //是否立即维修 1是 0 否
equRepairWorkOrder.setWorkPlanTime(equRepairOrder.getWorkPlanTime()); //计划维修时间
equRepairWorkOrder.setWorkPlanDownTime(DateUtils.getNowDate()); //停机维修
if (equRepairOrder.getWorkPlanDownTime() != null) { //是否停机维修 停机维修时间
equRepairWorkOrder.setWorkDownMachine("1");
equRepairWorkOrder.setWorkPlanDownTime(equRepairOrder.getWorkPlanDownTime());

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

@ -370,10 +370,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
String key = "#header.poolName";
equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder);
////审核结果
equRepairOrder.setOrderStatus("1");
////更新设备状态
EquEquipment equEquipment = new EquEquipment();
equEquipment.setEquipmentCode(equRepairOrder.getEquipmentCode());

2
op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml
Unescape Escape View File

@ -218,6 +218,7 @@
erwo.work_outsource,
erwo.work_down_machine,
erwo.equipment_code,
ebae.equipment_name as bind_equipment_name,
erwo.work_reason,
erwo.work_fault_desc,
erwo.work_start_time,
@ -253,6 +254,7 @@
from equ_repair_work_order erwo
left join base_equipment be on erwo.equipment_code = be.equipment_code
left join equ_team et on erwo.work_team = et.team_code
LEFT JOIN equ_bind_auxiliary_equipment ebae ON ebae.auxiliary_equipment_code = erwo.equipment_code
where NOT (erwo.work_status = #{workStatus})
and erwo.work_outsource = #{workOutsource}
and erwo.del_flag = '0'

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

@ -341,7 +341,7 @@ public class OpenServiceImpl implements OpenService {
equRepairWorkOrderBo.setOrderCode(equRepairOrder.getOrderCode()); //报修单号
equRepairWorkOrderBo.setWorkCode("WX" + workCode); //维修单号
equRepairWorkOrderBo.setEquipmentCode(equRepairOrder.getEquipmentCode()); //设备编码
equRepairWorkOrderBo.setWorkTeam(equRepairOrder.getWorkTeam()); //维修组
equRepairWorkOrderBo.setWorkTeam("机修"); //维修组
equRepairWorkOrderBo.setWorkOutsource("0"); //不委外
equRepairWorkOrderBo.setOutWorkCode("无"); //无委外工单号
equRepairWorkOrderBo.setWorkHandle("1"); //是否立即维修 1是 0 否

Write Preview
Loading…
Cancel
Save