设备管理 审核时判断设备是不是真的故障 需要维修

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java

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