diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java
index 2e36528e..990c3745 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java
@@ -147,6 +147,10 @@ public class Equipment extends BaseEntity {
@Excel(name = "SAP资产号")
private String sapAsset;
+ /** 设备状态 */
+ @Excel(name = "设备状态")
+ private String equipmentStatus;
+
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
@@ -393,6 +397,14 @@ public class Equipment extends BaseEntity {
return sapAsset;
}
+ //设备状态
+ public void setEquipmentStatus(String equipmentStatus) {
+ this.equipmentStatus = equipmentStatus;
+ }
+ public String getEquipmentStatus() {
+ return equipmentStatus;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
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 1bd1fcec..b59c2611 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
@@ -6,9 +6,12 @@ import com.baomidou.dynamic.datasource.annotation.DS;
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.EquEquipment;
import com.op.device.domain.EquRepairWorkOrder;
+import com.op.device.domain.Equipment;
import com.op.device.mapper.EquOrderMapper;
import com.op.device.mapper.EquRepairWorkOrderMapper;
+import com.op.device.mapper.EquipmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.device.mapper.EquOutsourceWorkMapper;
@@ -36,6 +39,10 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
@Autowired
private EquOrderMapper equOrderMapper;
+ @Autowired
+ private EquipmentMapper equipmentMapper;
+
+
/**
* 查询委外工单
@@ -70,7 +77,7 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
@Override
@DS("#header.poolName")
public int insertEquOutsourceWork(EquOutsourceWork equOutsourceWork) {
- //新增的委外工单，不用报修单号、维修单号拼接
+ //新增的委外工单，不用报修单号、维修单号拼接,流水号生成
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
String serialNum = String.format("%03d", equOutsourceWorkMapper.selectWorkCodeSerialNumber());
String equipmentCode = equOutsourceWork.getEquipmentCode();
@@ -83,6 +90,32 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
+
+ ////修改工单状态、设备状态
+ if(equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("0")){
+ //更新维修工单状态
+ equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode());
+
+ //修改设备状态 改为正常运行
+ EquEquipment equEquipment = new EquEquipment();
+ equEquipment.setEquipmentCode(equOutsourceWork.getEquipmentCode());
+ equEquipment.setEquipmentStatus("1");
+ equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
+ }else if(equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("1")){
+ //更新保养工单状态
+ equOrderMapper.updateEquOrderStatusComplete(equOutsourceWork.getRepairCode());
+
+ //修改设备状态 改为正常运行
+ //查找当前运行的设备信息 如果是维修中则不改 维修>保养
+ EquEquipment example = new EquEquipment();
+ example.setEquipmentCode(equOutsourceWork.getEquipmentCode());
+ Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOutsourceWork.getEquipmentCode());
+ if(equipment.getEquipmentStatus().equals("3")){
+ example.setEquipmentStatus("1");
+ equRepairWorkOrderMapper.updateEquipmentStatus(example);
+ }
+ }
+
return equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork);
}
@@ -95,13 +128,31 @@ public class EquOutsourceWorkServiceImpl implements IEquOutsourceWorkService {
@Override
@DS("#header.poolName")
public int updateEquOutsourceWork(EquOutsourceWork equOutsourceWork) {
- //1完成委外
- if(equOutsourceWork.getWorkStatus().equals("1")){
+ //1完成委外，更新工单状态
+ if(equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("0")){
//更新维修工单状态
equRepairWorkOrderMapper.updateWorkStatus(equOutsourceWork.getRepairCode());
+
+ //修改设备状态 改为正常运行
+ EquEquipment equEquipment = new EquEquipment();
+ equEquipment.setEquipmentCode(equOutsourceWork.getEquipmentCode());
+ equEquipment.setEquipmentStatus("1");
+ equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment);
+ }else if(equOutsourceWork.getWorkStatus().equals("1") && equOutsourceWork.getWorkType().equals("1")){
//更新保养工单状态
equOrderMapper.updateEquOrderStatusComplete(equOutsourceWork.getRepairCode());
+
+ //修改设备状态 改为正常运行
+ //查找当前运行的设备信息 如果是维修中则不改 维修>保养
+ EquEquipment example = new EquEquipment();
+ example.setEquipmentCode(equOutsourceWork.getEquipmentCode());
+ Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOutsourceWork.getEquipmentCode());
+ if(equipment.getEquipmentStatus().equals("3")){
+ example.setEquipmentStatus("1");
+ equRepairWorkOrderMapper.updateEquipmentStatus(example);
+ }
}
+
equOutsourceWork.setUpdateTime(DateUtils.getNowDate());
equOutsourceWork.setUpdateBy(SecurityUtils.getUsername());
return equOutsourceWorkMapper.updateEquOutsourceWork(equOutsourceWork);
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml
index b69d3672..f04ce755 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquipmentMapper.xml
@@ -45,15 +45,17 @@
+
- select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price, equipment_barcode, equipment_barcode_image, manufacturer, supplier, use_life, buy_time, asset_original_value, net_asset_value, asset_head, fixed_asset_code, department, unit_working_hours, plc_ip, plc_port, del_flag, sap_asset from base_equipment
+ select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price, equipment_barcode, equipment_barcode_image, manufacturer, supplier, use_life, buy_time, asset_original_value, net_asset_value, asset_head, fixed_asset_code, department, unit_working_hours, plc_ip, plc_port, del_flag, sap_asset,equipment_status from base_equipment
\ No newline at end of file