linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修改设备台账字段、修改维修单相关字段，添加点检任务设备id过滤条件

Browse Source
main
HuangHuiKang 3 weeks ago
parent cae6e64c65
commit b4c11c8d29
11 changed files with 195 additions and 10 deletions
Show Stats Download Patch File Download Diff File

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java
Unescape Escape View File

@ -99,4 +99,10 @@ public class DeviceLedgerPageReqVO extends PageParam {
@Schema(description = "产品Id")
private Long productId;
@Schema(description = "出厂日期")
private LocalDateTime outgoingTime;
@Schema(description = "序列号")
private String sn;
}

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java
Unescape Escape View File

@ -175,4 +175,10 @@ public class DeviceLedgerRespVO extends BaseDO {
@Schema(description = "打印模板")
private String templateJson;
@Schema(description = "出厂日期")
private LocalDateTime outgoingTime;
@Schema(description = "序列号")
private String sn;
}

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java
Unescape Escape View File

@ -96,4 +96,10 @@ public class DeviceLedgerSaveReqVO {
@Schema(description = "数据采集产能")
private Integer dataCollectionCapacity;
@Schema(description = "出厂日期")
private LocalDateTime outgoingTime;
@Schema(description = "序列号")
private String sn;
}

32
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairRespVO.java
Unescape Escape View File

@ -91,6 +91,36 @@ public class DvRepairRespVO {
@ExcelProperty("维修结果")
private String repairResult;
@Schema(description = "故障现象")
private String faultPhenomenon;
@Schema(description = "故障描述")
private String faultDescription;
@Schema(description = "故障图片，多个用逗号分隔")
private String faultImages;
@Schema(description = "停机时长")
private String downtimeDuration;
@Schema(description = "是否停机")
private Boolean isShutdown;
@Schema(description = "故障原因")
private String faultReason;
@Schema(description = "处理措施")
private String handlingMeasures;
@Schema(description = "更换配件")
private String replacementParts;
@Schema(description = "维修内容")
private String repairContent;
@Schema(description = "维修后图片，多个用逗号分隔")
private String repairedImages;
@Schema(description = "维修人员")
@ExcelProperty("维修人员")
private String acceptedBy;
@ -130,4 +160,4 @@ public class DvRepairRespVO {
@Schema(description = "维修状态")
@ExcelProperty("维修状态")
private String repairStatusName;
}
}

32
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepairSaveReqVO.java
Unescape Escape View File

@ -57,6 +57,36 @@ public class DvRepairSaveReqVO {
@Schema(description = "维修结果")
private String repairResult;
@Schema(description = "故障现象")
private String faultPhenomenon;
@Schema(description = "故障描述")
private String faultDescription;
@Schema(description = "故障图片，多个用逗号分隔")
private String faultImages;
@Schema(description = "停机时长")
private String downtimeDuration;
@Schema(description = "是否停机")
private Boolean isShutdown;
@Schema(description = "故障原因")
private String faultReason;
@Schema(description = "处理措施")
private String handlingMeasures;
@Schema(description = "更换配件")
private String replacementParts;
@Schema(description = "维修内容")
private String repairContent;
@Schema(description = "维修后图片，多个用逗号分隔")
private String repairedImages;
@Schema(description = "维修人员")
private String acceptedBy;
@ -83,4 +113,4 @@ public class DvRepairSaveReqVO {
}
}

33
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/vo/DvRepirUpdateReqVO.java
Unescape Escape View File

@ -34,9 +34,42 @@ public class DvRepirUpdateReqVO {
@NotBlank(message = "维修结果不能为空")
private String repairResult;
@Schema(description = "故障现象")
private String faultPhenomenon;
@Schema(description = "故障描述")
private String faultDescription;
@Schema(description = "故障图片，多个用逗号分隔")
private String faultImages;
@Schema(description = "停机时长")
private String downtimeDuration;
@Schema(description = "是否停机")
private Boolean isShutdown;
@Schema(description = "故障原因")
private String faultReason;
@Schema(description = "处理措施")
private String handlingMeasures;
@Schema(description = "更换配件")
private String replacementParts;
@Schema(description = "维修内容")
private String repairContent;
@Schema(description = "维修后图片，多个用逗号分隔")
private String repairedImages;
@Schema(description = "备注")
private String remark;
@Schema(description = "维修结果 0-待维修 1-通过 2-不通过")
private Integer repairStatus;
@Schema(description = "子列表")
@NotNull(message = "子列表不能为空")
private List<DvRepairLineSaveReqVO> updateReqVOList;

5
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/vo/TaskManagementPageReqVO.java
Unescape Escape View File

@ -24,6 +24,9 @@ public class TaskManagementPageReqVO extends PageParam {
@Schema(description = "设备列表")
private String deviceList;
@Schema(description = "设备Id集合，多选筛选")
private List<Long> deviceIds;
@Schema(description = "项目表单")
private Long projectForm;
@ -51,4 +54,4 @@ public class TaskManagementPageReqVO extends PageParam {
@Schema(description = "id集合导出用")
private String ids;
}
}

10
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java
Unescape Escape View File

@ -6,6 +6,8 @@ import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.criticalcomponent.CriticalComponentDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.dvrepair.DvRepairLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.ticketresults.TicketResultsDO;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.*;
@ -209,6 +211,14 @@ public class DeviceLedgerDO extends BaseDO {
*/
private Integer dataCollectionCapacity;
/**
* 出厂日期
*/
private LocalDateTime outgoingTime;
/**
* 序列号
*/
private String sn;
}

42
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvrepair/DvRepairDO.java
Unescape Escape View File

@ -89,6 +89,46 @@ public class DvRepairDO extends BaseDO {
* 维修结果
*/
private String repairResult;
/**
* 故障现象
*/
private String faultPhenomenon;
/**
* 故障描述
*/
private String faultDescription;
/**
* 故障图片
*/
private String faultImages;
/**
* 停机时长
*/
private String downtimeDuration;
/**
* 是否停机
*/
private Boolean isShutdown;
/**
* 故障原因
*/
private String faultReason;
/**
* 处理措施
*/
private String handlingMeasures;
/**
* 更换配件
*/
private String replacementParts;
/**
* 维修内容
*/
private String repairContent;
/**
* 维修后图片
*/
private String repairedImages;
/**
* 维修人员
*/
@ -129,4 +169,4 @@ public class DvRepairDO extends BaseDO {
private Integer repairStatus;
}
}

14
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/taskmanagement/TaskManagementMapper.java
Unescape Escape View File

@ -21,8 +21,6 @@ import cn.iocoder.yudao.module.mes.controller.admin.taskmanagement.vo.*;
public interface TaskManagementMapper extends BaseMapperX<TaskManagementDO> {
default PageResult<TaskManagementDO> selectPage(TaskManagementPageReqVO reqVO) {
LambdaQueryWrapperX<TaskManagementDO> taskManagementDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
taskManagementDOLambdaQueryWrapperX
.likeIfPresent(TaskManagementDO::getName, reqVO.getName())
@ -37,6 +35,16 @@ public interface TaskManagementMapper extends BaseMapperX<TaskManagementDO> {
.betweenIfPresent(TaskManagementDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TaskManagementDO::getId);
if (reqVO.getDeviceIds() != null && !reqVO.getDeviceIds().isEmpty()) {
String deviceIdsSql = reqVO.getDeviceIds().stream()
.filter(Objects::nonNull)
.map(deviceId -> "FIND_IN_SET(" + deviceId + ", device_list) > 0")
.collect(Collectors.joining(" OR "));
if (StringUtils.isNotBlank(deviceIdsSql)) {
taskManagementDOLambdaQueryWrapperX.apply("(" + deviceIdsSql + ")");
}
}
// 单独处理 ids 条件
if (StringUtils.isNotBlank(reqVO.getIds())) {
List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
@ -50,4 +58,4 @@ public interface TaskManagementMapper extends BaseMapperX<TaskManagementDO> {
return selectPage(reqVO, taskManagementDOLambdaQueryWrapperX);
}
}
}

19
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/dvrepair/DvRepairServiceImpl.java
Unescape Escape View File

@ -75,7 +75,7 @@ public class DvRepairServiceImpl implements DvRepairService {
dvRepairMapper.insert(dvRepair);
// 插入子表
createDvRepairLineList(dvRepair.getId(), createReqVO.getDvRepairLines());
// createDvRepairLineList(dvRepair.getId(), createReqVO.getDvRepairLines());
// 返回
return dvRepair.getId();
}
@ -102,7 +102,7 @@ public class DvRepairServiceImpl implements DvRepairService {
dvRepairMapper.updateById(updateObj);
// 更新子表
updateDvRepairLineList(updateReqVO.getId(), updateReqVO.getDvRepairLines());
// updateDvRepairLineList(updateReqVO.getId(), updateReqVO.getDvRepairLines());
}
@ -195,8 +195,21 @@ public class DvRepairServiceImpl implements DvRepairService {
dvRepairDO.setFinishDate(updateReqVO.getFinishDate());
dvRepairDO.setConfirmDate(updateReqVO.getConfirmDate());
dvRepairDO.setRepairResult(updateReqVO.getRepairResult());
dvRepairDO.setFaultPhenomenon(updateReqVO.getFaultPhenomenon());
dvRepairDO.setFaultDescription(updateReqVO.getFaultDescription());
dvRepairDO.setFaultImages(updateReqVO.getFaultImages());
dvRepairDO.setDowntimeDuration(updateReqVO.getDowntimeDuration());
dvRepairDO.setIsShutdown(updateReqVO.getIsShutdown());
dvRepairDO.setFaultReason(updateReqVO.getFaultReason());
dvRepairDO.setHandlingMeasures(updateReqVO.getHandlingMeasures());
dvRepairDO.setReplacementParts(updateReqVO.getReplacementParts());
dvRepairDO.setRepairContent(updateReqVO.getRepairContent());
dvRepairDO.setRepairedImages(updateReqVO.getRepairedImages());
dvRepairDO.setRemark(updateReqVO.getRemark());
dvRepairDO.setRepairStatus(updateReqVO.getRepairStatus());
dvRepairDO.setStatus(RepairStatusEnum.COMPLETED.getCode());
dvRepairMapper.updateById(dvRepairDO);
batchUpdateTicketResults(updateReqVO.getUpdateReqVOList());
// batchUpdateTicketResults(updateReqVO.getUpdateReqVOList());
}

Write Preview
Loading…
Cancel
Save