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

Merge remote-tracking branch 'origin/master'

Browse Source
master
wws 2 years ago
parent 5c0b7d3cbe 6c81f5e1d1
commit aa95f14f67
6 changed files with 228 additions and 106 deletions
Show Stats Download Patch File Download Diff File

12
op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java
Unescape Escape View File

@ -154,6 +154,10 @@ public class EquEquipment extends BaseEntity {
@Excel(name = "SAP资产号") @Excel(name = "SAP资产号")
private String sapAsset; private String sapAsset;
/** 设备状态 */
@Excel(name = "设备状态")
private String equipmentStatus;
public void setEquipmentId(Long equipmentId) { public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId; this.equipmentId = equipmentId;
} }
@ -400,6 +404,14 @@ public class EquEquipment extends BaseEntity {
return sapAsset; return sapAsset;
} }
//设备状态
public void setEquipmentStatus(String equipmentStatus) {
this.equipmentStatus = equipmentStatus;
}
public String getEquipmentStatus() {
return equipmentStatus;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

8
op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java
Unescape Escape View File

@ -4,6 +4,7 @@ import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.domain.BaseFileData; import com.op.common.core.domain.BaseFileData;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.EquTeamUser; import com.op.device.domain.EquTeamUser;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -104,4 +105,11 @@ public interface EquRepairWorkOrderMapper {
* @return * @return
*/ */
EquRepairWorkOrder selectEquRepairWorkOrderByWorkCode(String workCode); EquRepairWorkOrder selectEquRepairWorkOrderByWorkCode(String workCode);
/**
* 修改设备状态
* @param equEquipment
* @return
*/
public int updateEquipmentStatus(EquEquipment equEquipment);
} }

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

@ -15,6 +15,7 @@ import com.op.device.service.IDevicePDAService;
import com.op.system.api.domain.SysUser; import com.op.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
@ -555,14 +556,23 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
//维修中 //维修中
equRepairWorkOrder.setWorkStatus("2"); equRepairWorkOrder.setWorkStatus("2");
//维修工单里面的设备名 简化TODO
EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId());
//修改设备状态 改为维修中
EquEquipment equEquipment = new EquEquipment();
equEquipment.setEquipmentCode(list.getEquipmentCode());
equEquipment.setEquipmentStatus("2");
equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
return success("提交成功，开始维修！"); return success("提交成功，设备开始维修！");
} catch (Exception e) { } catch (Exception e) {
return error(); return error();
} }
} }
/** /**
* 查询设备
* @param equipmentId * @param equipmentId
* @return * @return
*/ */
@ -635,117 +645,148 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
* @param equRepairWorkOrder * @param equRepairWorkOrder
* @return * @return
*/ */
@Transactional//增加事务注解，出错时自动回滚
@Override @Override
@DS("#header.poolName") @DS("#header.poolName")
public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) {
//判断是否停机 try {
EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); //判断是否停机
if (list.getWorkDownMachine().equals("1")) { EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId());
//维修结束时间、维修真正停机时间 if (list.getWorkDownMachine().equals("1")) {
equRepairWorkOrder.setActualDownEndTime(DateUtils.getNowDate()); //维修真正停机时间
} equRepairWorkOrder.setActualDownEndTime(DateUtils.getNowDate());
equRepairWorkOrder.setWorkEndTime(DateUtils.getNowDate()); }
//更新每一项点检/巡检检查项信息 //维修工单结束时间
List<EquOrder> checkLists = equRepairWorkOrder.getDetailList(); equRepairWorkOrder.setWorkEndTime(DateUtils.getNowDate());
for (EquOrder checkList : checkLists) {
checkList.setUpdateBy(SecurityUtils.getUsername()); ////更新每一项点检/巡检检查项信息
checkList.setUpdateTime(DateUtils.getNowDate()); //判空
List<EquOrderStandard> standardLists = checkList.getStandardList(); if(StringUtils.isNotEmpty(equRepairWorkOrder.getDetailList())){
for (EquOrderStandard standardList : standardLists) { List<EquOrder> checkLists = equRepairWorkOrder.getDetailList();
//先删除每个检查项标准图片 for (EquOrder checkList : checkLists) {
equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId()); checkList.setUpdateBy(SecurityUtils.getUsername());
//图片 checkList.setUpdateTime(DateUtils.getNowDate());
if (StringUtils.isNotEmpty(standardList.getPicturePath())) { List<EquOrderStandard> standardLists = checkList.getStandardList();
String[] ids = standardList.getPicturePath().split(","); for (EquOrderStandard standardList : standardLists) {
List<BaseFileData> files = new ArrayList<>(); //先删除每个检查项标准图片
BaseFileData file = null; equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId());
for (String id : ids) { //图片批量新增
file = new BaseFileData(); if (StringUtils.isNotEmpty(standardList.getPicturePath())) {
file.setFileId(IdUtils.fastSimpleUUID()); String[] ids = standardList.getPicturePath().split(",");
file.setFileName(id.split("&fileName=")[1]); List<BaseFileData> files = new ArrayList<>();
file.setFileAddress(id); BaseFileData file = null;
file.setSourceId(standardList.getId()); for (String id : ids) {
file.setCreateBy(SecurityUtils.getUsername()); file = new BaseFileData();
file.setCreateTime(new Date()); file.setFileId(IdUtils.fastSimpleUUID());
//维修后 file.setFileName(id.split("&fileName=")[1]);
file.setImageType("4"); file.setFileAddress(id);
files.add(file); file.setSourceId(standardList.getId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//图片类型 维修后
file.setImageType("4");
files.add(file);
}
equOrderStandardMapper.insertBaseFileBatch(files);
}
standardList.setRepairReach(standardList.getDetailReach());
standardList.setRepairValue(standardList.getActualValue());
standardList.setUpdateTime(DateUtils.getNowDate());
standardList.setUpdateBy(SecurityUtils.getUsername());
equOrderStandardMapper.updateActualValues(standardList);
} }
equOrderStandardMapper.insertBaseFileBatch(files); equOrderMapper.updateEquOrder(checkList);
} }
standardList.setRepairReach(standardList.getDetailReach());
standardList.setRepairValue(standardList.getActualValue());
standardList.setUpdateTime(DateUtils.getNowDate());
standardList.setUpdateBy(SecurityUtils.getUsername());
equOrderStandardMapper.updateActualValues(standardList);
} }
equOrderMapper.updateEquOrder(checkList);
}
//新建申领单 ////新建申领单
List<EquSpareApply> equSpareApplies = equRepairWorkOrder.getApplyList(); //判空
for (EquSpareApply equSpareApply : equSpareApplies) { if(StringUtils.isNotEmpty(equRepairWorkOrder.getApplyList())){
//生成领料单code List<EquSpareApply> equSpareApplies = equRepairWorkOrder.getApplyList();
String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber()); for (EquSpareApply equSpareApply : equSpareApplies) {
String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairWorkOrder.getWorkCode().substring(10); //生成领料单code
//十五位单号 String serialNum = String.format("%03d", equSpareApplyMapper.selectSerialNumber());
equSpareApply.setApplyCode("AW" + code + serialNum); String code = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + equRepairWorkOrder.getWorkCode().substring(10);
equSpareApply.setApplyId(IdUtils.fastSimpleUUID()); //十五位单号
//备品备件规格型号！！！！！ equSpareApply.setApplyCode("AW" + code + serialNum);
// equSpareApply.setSpareModel(equSpareApply.getS); equSpareApply.setApplyId(IdUtils.fastSimpleUUID());
equSpareApply.setSpareCode(equSpareApply.getMaterialCode()); //备品备件规格型号！！！！！
equSpareApply.setSpareName(equSpareApply.getMaterialDesc()); //equSpareApply.setSpareModel(equSpareApply.getSpareMode());
equSpareApply.setApplyPeople(SecurityUtils.getUsername()); //备件编码
equSpareApply.setCreateBy(SecurityUtils.getUsername()); equSpareApply.setSpareCode(equSpareApply.getMaterialCode());
equSpareApply.setCreateTime(DateUtils.getNowDate()); //备件名称
equSpareApply.setApplyTime(DateUtils.getNowDate()); equSpareApply.setSpareName(equSpareApply.getMaterialDesc());
equSpareApply.setSpareUseEquipment(equRepairWorkOrder.getEquipmentCode()); //申领人
equSpareApply.setWorkCode(equRepairWorkOrder.getWorkCode()); equSpareApply.setApplyPeople(SecurityUtils.getUsername());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); equSpareApply.setCreateBy(SecurityUtils.getUsername());
String key = "#header.poolName"; equSpareApply.setCreateTime(DateUtils.getNowDate());
equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); //申领时间
equSpareApplyMapper.insertEquSpareApply(equSpareApply); equSpareApply.setApplyTime(DateUtils.getNowDate());
//使用设备
equSpareApply.setSpareUseEquipment(equRepairWorkOrder.getEquipmentCode());
//关联维修工单号
equSpareApply.setWorkCode(equRepairWorkOrder.getWorkCode());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
//工厂号
equSpareApply.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
equSpareApplyMapper.insertEquSpareApply(equSpareApply);
//更新完备品申领单后，更新库存 ////更新完备品申领单后，更新库存
SparePartsLedger sparePartsLedger = new SparePartsLedger(); SparePartsLedger sparePartsLedger = new SparePartsLedger();
sparePartsLedger.setStorageId(equSpareApply.getStorageId()); sparePartsLedger.setStorageId(equSpareApply.getStorageId());
BigDecimal applyNum = equSpareApply.getSpareQuantity(); BigDecimal applyNum = equSpareApply.getSpareQuantity();
BigDecimal amount = equSpareApply.getAmount(); BigDecimal amount = equSpareApply.getAmount();
sparePartsLedger.setAmount(amount.subtract(applyNum)); //减去库存
sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger); sparePartsLedger.setAmount(amount.subtract(applyNum));
} sparePartsLedgerMapper.updateSparePartsLedger(sparePartsLedger);
}
//图片
//先删除每个维修工单对应图片
equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId());
if (StringUtils.isNotEmpty(equRepairWorkOrder.getFileList())) {
String[] ids = equRepairWorkOrder.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equRepairWorkOrder.getWorkId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//维修后
file.setImageType("4");
files.add(file);
} }
equRepairWorkOrderMapper.insertBaseFileBatch(files);
////增加多个维修后照片
//先删除每个维修工单对应图片
equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId());
if (StringUtils.isNotEmpty(equRepairWorkOrder.getFileList())) {
String[] ids = equRepairWorkOrder.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
file.setFileAddress(id);
file.setSourceId(equRepairWorkOrder.getWorkId());
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
//维修后
file.setImageType("4");
files.add(file);
}
equRepairWorkOrderMapper.insertBaseFileBatch(files);
}
////更新维修工单
//维修状态
equRepairWorkOrder.setWorkStatus("1");
//维修人
equRepairWorkOrder.setWorkPerson(SecurityUtils.getUsername());
//维修人员联系方式TODO！！！！
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
//维修工单里面的设备名 简化TODO
EquRepairWorkOrder example = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId());
//修改设备状态 由维修中改为正常运行
EquEquipment equEquipment = new EquEquipment();
equEquipment.setEquipmentCode(example.getEquipmentCode());
equEquipment.setEquipmentStatus("1");
equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
return success("提交成功，维修完成！");
} catch (Exception e) {
return error("提交失败！");
} }
//维修人：当前登录人
//维修状态
equRepairWorkOrder.setWorkStatus("1");
//维修结束时间
equRepairWorkOrder.setWorkPerson(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
//需要更新设备状态????这里没做
return success("提交成功，维修完成！");
} }
/** /**

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

@ -164,6 +164,7 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
/** /**
* 审核故障报修 * 审核故障报修
* 审核过程中判断设备是不是真的故障 需要维修
* *
* @param equRepairOrder 故障报修 * @param equRepairOrder 故障报修
* @return 结果 * @return 结果
@ -171,7 +172,7 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
@Override @Override
@DS("#header.poolName") @DS("#header.poolName")
public int checkEquRepairOrder(EquRepairOrder equRepairOrder) { public int checkEquRepairOrder(EquRepairOrder equRepairOrder) {
//改了，不生成流水号，从第十位开始切割 //不生成流水号，从报修单号第十位开始切割、拼接
String code = equRepairOrder.getOrderCode().substring(10); String code = equRepairOrder.getOrderCode().substring(10);
String workCode = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + code; String workCode = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + code;
//判断是否是点检、巡检过来的 //判断是否是点检、巡检过来的
@ -185,7 +186,6 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
one.setWorkCode("WX" + workCode); one.setWorkCode("WX" + workCode);
one.setUpdateBy(SecurityUtils.getUsername()); one.setUpdateBy(SecurityUtils.getUsername());
one.setUpdateTime(DateUtils.getNowDate()); one.setUpdateTime(DateUtils.getNowDate());
//只更新其中一个信息
equOrderMapper.updateEquOrderRepairCode(one); equOrderMapper.updateEquOrderRepairCode(one);
} }
} }
@ -196,11 +196,15 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode()); equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode());
//维修单号 //维修单号
equRepairWorkOrder.setWorkCode("WX" + workCode); equRepairWorkOrder.setWorkCode("WX" + workCode);
//报修id
equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId()); equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId());
//设备编号
equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode()); equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode());
//维修组
equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam()); equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam());
//不委外 //不委外
equRepairWorkOrder.setWorkOutsource("0"); equRepairWorkOrder.setWorkOutsource("0");
//无委外单号
equRepairWorkOrder.setOutWorkCode("无"); equRepairWorkOrder.setOutWorkCode("无");
//是否立即维修 1是 0 否 //是否立即维修 1是 0 否
equRepairWorkOrder.setWorkHandle("0"); equRepairWorkOrder.setWorkHandle("0");
@ -213,7 +217,9 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
}else{ }else{
equRepairWorkOrder.setWorkDownMachine("0"); equRepairWorkOrder.setWorkDownMachine("0");
} }
//故障描述？？？？
equRepairWorkOrder.setWorkFaultDesc(equRepairOrder.getOrderDesc()); equRepairWorkOrder.setWorkFaultDesc(equRepairOrder.getOrderDesc());
//维修状态 待维修
equRepairWorkOrder.setWorkStatus("0"); equRepairWorkOrder.setWorkStatus("0");
equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID()); equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID());
equRepairWorkOrder.setCreateTime(DateUtils.getNowDate()); equRepairWorkOrder.setCreateTime(DateUtils.getNowDate());
@ -225,20 +231,35 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder);
equRepairOrder.setOrderStatus("审核通过"); equRepairOrder.setOrderStatus("审核通过");
////更新设备状态
EquEquipment equEquipment = new EquEquipment();
equEquipment.setEquipmentCode(equRepairOrder.getEquipmentCode());
//0 故障
equEquipment.setEquipmentStatus("0");
equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
}else if(equRepairOrder.getRepairDestination().equals("不维修")){ }else if(equRepairOrder.getRepairDestination().equals("不维修")){
equRepairOrder.setOrderStatus("驳回"); equRepairOrder.setOrderStatus("驳回");
}else if(equRepairOrder.getRepairDestination().equals("委外维修")){ }else if(equRepairOrder.getRepairDestination().equals("委外维修")){
EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); EquOutsourceWork equOutsourceWork = new EquOutsourceWork();
//委外工单编码、id、联系方式、委外单位、委外人员、委外原因 //id
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
//报修单号
equOutsourceWork.setOrderCode(equRepairOrder.getOrderCode()); equOutsourceWork.setOrderCode(equRepairOrder.getOrderCode());
//设备编码
equOutsourceWork.setEquipmentCode(equRepairOrder.getEquipmentCode()); equOutsourceWork.setEquipmentCode(equRepairOrder.getEquipmentCode());
//委外工单号
equOutsourceWork.setWorkCode("WW" + workCode); equOutsourceWork.setWorkCode("WW" + workCode);
//维修工单号
equOutsourceWork.setRepairCode("无"); equOutsourceWork.setRepairCode("无");
//委外联系方式
equOutsourceWork.setWorkConnection(equRepairOrder.getWorkConnection()); equOutsourceWork.setWorkConnection(equRepairOrder.getWorkConnection());
//委外单位
equOutsourceWork.setWorkOutsourcingUnit(equRepairOrder.getWorkOutsourcingUnit()); equOutsourceWork.setWorkOutsourcingUnit(equRepairOrder.getWorkOutsourcingUnit());
//委外人员
equOutsourceWork.setWorkPerson(equRepairOrder.getOutSourcePerson()); equOutsourceWork.setWorkPerson(equRepairOrder.getOutSourcePerson());
//委外原因
equOutsourceWork.setWorkReason(equRepairOrder.getOutSourceReason()); equOutsourceWork.setWorkReason(equRepairOrder.getOutSourceReason());
//委外类型 维修委外 //委外类型 维修委外
equOutsourceWork.setWorkType("0"); equOutsourceWork.setWorkType("0");
@ -246,20 +267,35 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equOutsourceWork.setCreateTime(DateUtils.getNowDate()); equOutsourceWork.setCreateTime(DateUtils.getNowDate());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName"; String key = "#header.poolName";
//工厂号
equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork);
equRepairOrder.setOrderStatus("审核通过"); equRepairOrder.setOrderStatus("审核通过");
////更新设备状态
EquEquipment equEquipment = new EquEquipment();
equEquipment.setEquipmentCode(equRepairOrder.getEquipmentCode());
//0 故障
equEquipment.setEquipmentStatus("0");
equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
}else if(equRepairOrder.getRepairDestination().equals("立即维修")){ }else if(equRepairOrder.getRepairDestination().equals("立即维修")){
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder(); EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
//维修工单id
equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID());
//报修单号 //报修单号
equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode()); equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode());
//维修单号 //维修单号
equRepairWorkOrder.setWorkCode("WX"+workCode); equRepairWorkOrder.setWorkCode("WX"+workCode);
//orderId
equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId()); equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId());
//设备编码
equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode()); equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode());
//维修组
equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam()); equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam());
//不委外 //不委外
equRepairWorkOrder.setWorkOutsource("0"); equRepairWorkOrder.setWorkOutsource("0");
//无委外工单号
equRepairWorkOrder.setOutWorkCode("无"); equRepairWorkOrder.setOutWorkCode("无");
//是否立即维修 1是 0 否 //是否立即维修 1是 0 否
equRepairWorkOrder.setWorkHandle("0"); equRepairWorkOrder.setWorkHandle("0");
@ -272,9 +308,10 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
}else{ }else{
equRepairWorkOrder.setWorkDownMachine("0"); equRepairWorkOrder.setWorkDownMachine("0");
} }
//故障描述
equRepairWorkOrder.setWorkFaultDesc(equRepairOrder.getOrderDesc()); equRepairWorkOrder.setWorkFaultDesc(equRepairOrder.getOrderDesc());
//工单状态 待维修
equRepairWorkOrder.setWorkStatus("0"); equRepairWorkOrder.setWorkStatus("0");
equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID());
equRepairWorkOrder.setCreateTime(DateUtils.getNowDate()); equRepairWorkOrder.setCreateTime(DateUtils.getNowDate());
equRepairWorkOrder.setCreateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setCreateBy(SecurityUtils.getUsername());
//工厂 //工厂
@ -283,6 +320,14 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder);
equRepairOrder.setOrderStatus("审核通过"); equRepairOrder.setOrderStatus("审核通过");
////更新设备状态
EquEquipment equEquipment = new EquEquipment();
equEquipment.setEquipmentCode(equRepairOrder.getEquipmentCode());
//0 故障
equEquipment.setEquipmentStatus("0");
equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
} }
equRepairOrder.setUpdateTime(DateUtils.getNowDate()); equRepairOrder.setUpdateTime(DateUtils.getNowDate());
equRepairOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairOrder.setUpdateBy(SecurityUtils.getUsername());

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

@ -185,6 +185,15 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
equOrderStandard.setUpdateTime(DateUtils.getNowDate()); equOrderStandard.setUpdateTime(DateUtils.getNowDate());
equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard); equOrderStandardMapper.updateStandardAfterRepair(equOrderStandard);
} }
if(equRepairWorkOrder.getWorkStatus().equals("1")){
//修改设备状态 由维修中改为正常运行
EquEquipment equEquipment = new EquEquipment();
equEquipment.setEquipmentCode(equRepairWorkOrder.getEquipmentCode());
equEquipment.setEquipmentStatus("1");
equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
}
return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
} }

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

@ -477,4 +477,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and del_flag = '0' and del_flag = '0'
</update> </update>
<update id="updateEquipmentStatus" parameterType="com.op.device.domain.EquEquipment">
update base_equipment
set equipment_status = #{equipmentStatus}
where equipment_code = #{equipmentCode}
and del_flag = '0'
</update>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save