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

fix:添加设备维修及点检保养工单分页过滤条件，修改添加模具外发状态

Browse Source
main
HuangHuiKang 1 day ago
parent 421c75394d
commit 34abb5b5c3
11 changed files with 64 additions and 23 deletions
Show Stats Download Patch File Download Diff File

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

@ -27,6 +27,9 @@ public class DvRepairPageReqVO extends PageParam {
@Schema(description = "设备ID", example = "6979")
private Long machineryId;
@Schema(description = "设备台账 ID", example = "6979")
private Long deviceId;
@Schema(description = "设备编码")
private String machineryCode;

1
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/scheduled/coretask/GenerateWorkOrderTask.java
Unescape Escape View File

@ -120,6 +120,7 @@ public class GenerateWorkOrderTask implements Task {
ticketManagementDO.setTaskId(taskManagementDO.getId());
ticketManagementDO.setPlanNo(generatePrefixedOrderNo());
ticketManagementDO.setPlanId(taskManagementDO.getProjectForm());
ticketManagementDO.setDeviceId(deviceId);
ticketManagementDO.setDeviceName(deviceLedgerDO.getDeviceName());
ticketManagementDO.setPlanType(taskManagementDO.getTaskType());
ticketManagementDO.setConfigName(taskManagementDO.getName());

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

@ -50,6 +50,9 @@ public class TicketManagementRespVO extends BaseDO {
@ExcelProperty("设备名称")
private String deviceName;
@Schema(description = "设备台账 ID", example = "6979")
private Long deviceId;
@Schema(description = "计划配置名称", example = "赵六")
@ -115,4 +118,4 @@ public class TicketManagementRespVO extends BaseDO {
}
}

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

@ -26,6 +26,9 @@ public class TicketManagementSaveReqVO {
@Schema(description = "设备名称", example = "张三")
private String deviceName;
@Schema(description = "设备台账 ID", example = "6979")
private Long deviceId;
@Schema(description = "类型", example = "2")
private String planType;
@ -42,4 +45,4 @@ public class TicketManagementSaveReqVO {
@Schema(description = "取消原因")
private String cancelReason;
}
}

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketmanagement/TicketManagementDO.java
Unescape Escape View File

@ -50,6 +50,10 @@ public class TicketManagementDO extends BaseDO {
* 设备名称
*/
private String deviceName;
/**
* 设备台账 ID
*/
private Long deviceId;
/**
* 类型(1-点检 2-保养)
*/
@ -92,4 +96,4 @@ public class TicketManagementDO extends BaseDO {
}
}

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/dvrepair/DvRepairMapper.java
Unescape Escape View File

@ -30,6 +30,12 @@ public interface DvRepairMapper extends BaseMapperX<DvRepairDO> {
if(CollUtil.isNotEmpty(reqVO.getMachineryIds())){
dvRepairDOLambdaQueryWrapperX.in(DvRepairDO::getMachineryId, reqVO.getMachineryIds());
}
if (reqVO.getDeviceId() != null) {
dvRepairDOLambdaQueryWrapperX.and(wrapper -> wrapper
.eq(DvRepairDO::getDeviceId, reqVO.getDeviceId())
.or()
.eq(DvRepairDO::getMachineryId, reqVO.getDeviceId()));
}
if (StringUtils.isNotBlank(reqVO.getKeyword())) {
dvRepairDOLambdaQueryWrapperX.and(w -> {
w.like(DvRepairDO::getRepairCode, reqVO.getKeyword());

13
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java
Unescape Escape View File

@ -49,6 +49,7 @@ public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO>
.eqIfPresent(TicketManagementDO::getTaskId, reqVO.getTaskId())
.eqIfPresent(TicketManagementDO::getPlanId, reqVO.getPlanId())
//.likeIfPresent(TicketManagementDO::getPlanNo, reqVO.getPlanNo())
.eqIfPresent(TicketManagementDO::getDeviceId, reqVO.getDeviceId())
.likeIfPresent(TicketManagementDO::getDeviceName, reqVO.getDeviceName())
.eqIfPresent(TicketManagementDO::getPlanType, reqVO.getPlanType())
.likeIfPresent(TicketManagementDO::getConfigName, reqVO.getConfigName())
@ -103,7 +104,19 @@ public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO>
default List<TicketManagementDO> selectList(TicketManagementPageReqVO reqVO) {
LambdaQueryWrapperX<TicketManagementDO> wrapper = new LambdaQueryWrapperX<>();
if(StringUtils.isNotBlank(reqVO.getPlanNo())&&CollUtil.isNotEmpty(reqVO.getMachineryNames())){
wrapper.and(w -> w
.like(TicketManagementDO::getPlanNo, reqVO.getPlanNo())
.or()
.in(TicketManagementDO::getDeviceName,reqVO.getMachineryNames())
);
}else if(CollUtil.isNotEmpty(reqVO.getMachineryNames())){
wrapper.in(TicketManagementDO::getDeviceName,reqVO.getMachineryNames());
}else{
wrapper.likeIfPresent(TicketManagementDO::getPlanNo, reqVO.getPlanNo());
}
wrapper
.eqIfPresent(TicketManagementDO::getDeviceId, reqVO.getDeviceId())
.eqIfPresent(TicketManagementDO::getPlanType, reqVO.getPlanType())
.eqIfPresent(TicketManagementDO::getJobStatus, reqVO.getJobStatus())
.orderByDesc(TicketManagementDO::getId);

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

@ -263,6 +263,12 @@ public class DvRepairServiceImpl implements DvRepairService {
if(CollUtil.isNotEmpty(pageReqVO.getMachineryIds())){
wrapper.in(DvRepairDO::getMachineryId, pageReqVO.getMachineryIds());
}
if (pageReqVO.getDeviceId() != null) {
wrapper.and(w -> w
.eq(DvRepairDO::getDeviceId, pageReqVO.getDeviceId())
.or()
.eq(DvRepairDO::getMachineryId, pageReqVO.getDeviceId()));
}
wrapper
.likeIfPresent(DvRepairDO::getRepairCode, pageReqVO.getRepairCode())
.likeIfPresent(DvRepairDO::getRepairName, pageReqVO.getRepairName())

2
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java
Unescape Escape View File

@ -499,7 +499,7 @@ public class MoldRepairServiceImpl implements MoldRepairService {
return;
}
Integer status = isRepairPassed(repairResult)
? MoldBrandStatusEnum.STANDBY.getStatus()
? MoldBrandStatusEnum.IN_STOCK.getStatus()
: MoldBrandStatusEnum.REPAIRING.getStatus();
updateMoldBrandStatus(moldId, status);
}

1
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/taskmanagement/TaskManagementServiceImpl.java
Unescape Escape View File

@ -239,6 +239,7 @@ public class TaskManagementServiceImpl implements TaskManagementService {
ticketManagementDO.setTaskId(taskManagementDO.getId());
ticketManagementDO.setPlanNo(generatePrefixedOrderNo());
ticketManagementDO.setPlanId(taskManagementDO.getProjectForm());
ticketManagementDO.setDeviceId(deviceId);
ticketManagementDO.setDeviceName(deviceLedgerDO.getDeviceName());
ticketManagementDO.setPlanType(taskManagementDO.getTaskType());
ticketManagementDO.setConfigName(taskManagementDO.getName());

39
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/ticketmanagement/TicketManagementServiceImpl.java
Unescape Escape View File

@ -93,28 +93,30 @@ public class TicketManagementServiceImpl implements TicketManagementService {
@Override
public PageResult<TicketManagementDO> getTicketManagementPage(TicketManagementPageReqVO pageReqVO) {
applyDeviceLedgerFilter(pageReqVO);
return ticketManagementMapper.selectPage(pageReqVO);
}
private void applyDeviceLedgerFilter(TicketManagementPageReqVO pageReqVO) {
if (pageReqVO.getDeviceId() != null) {
pageReqVO.setPlanNo(null);
DeviceLedgerDO deviceLedgerDO = deviceLedgerMapper.selectById(pageReqVO.getDeviceId());
if (deviceLedgerDO != null
&& StringUtils.isNotBlank(deviceLedgerDO.getDeviceName())
&& matchesDeviceLine(deviceLedgerDO, pageReqVO.getDeviceLineId())) {
pageReqVO.setMachineryNames(Collections.singletonList(deviceLedgerDO.getDeviceName()));
} else {
if (deviceLedgerDO == null || !matchesDeviceLine(deviceLedgerDO, pageReqVO.getDeviceLineId())) {
pageReqVO.setMachineryNames(emptyResultMachineryNames());
}
} else if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())||StringUtils.isNotBlank(pageReqVO.getPlanNo())) {
LambdaQueryWrapperX<DeviceLedgerDO> deviceLedgerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId()))
deviceLedgerDOLambdaQueryWrapperX.eqIfPresent(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId());
if(StringUtils.isNotBlank(pageReqVO.getPlanNo())){
deviceLedgerDOLambdaQueryWrapperX.and(w -> w
.like(DeviceLedgerDO::getDeviceCode, pageReqVO.getPlanNo())
.or()
.like(DeviceLedgerDO::getDeviceName, pageReqVO.getPlanNo())
);
return;
}
List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(deviceLedgerDOLambdaQueryWrapperX);
if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId())||StringUtils.isNotBlank(pageReqVO.getPlanNo())) {
LambdaQueryWrapperX<DeviceLedgerDO> deviceLedgerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
if(StringUtils.isNotBlank(pageReqVO.getDeviceLineId()))
deviceLedgerDOLambdaQueryWrapperX.eqIfPresent(DeviceLedgerDO::getDeviceLine, pageReqVO.getDeviceLineId());
if(StringUtils.isNotBlank(pageReqVO.getPlanNo())){
deviceLedgerDOLambdaQueryWrapperX.and(w -> w
.like(DeviceLedgerDO::getDeviceCode, pageReqVO.getPlanNo())
.or()
.like(DeviceLedgerDO::getDeviceName, pageReqVO.getPlanNo())
);
}
List<DeviceLedgerDO> deviceLedgerDOS = deviceLedgerMapper.selectList(deviceLedgerDOLambdaQueryWrapperX);
List<String> machineryNames = deviceLedgerDOS.stream().map(DeviceLedgerDO::getDeviceName).distinct().collect(Collectors.toList());
if(CollUtil.isNotEmpty(machineryNames)){
pageReqVO.setMachineryNames(machineryNames);
@ -122,8 +124,6 @@ public class TicketManagementServiceImpl implements TicketManagementService {
pageReqVO.setMachineryNames(emptyResultMachineryNames());
}
}
return ticketManagementMapper.selectPage(pageReqVO);
}
@Override
@ -138,6 +138,7 @@ public class TicketManagementServiceImpl implements TicketManagementService {
TicketManagementPageReqVO statisticsReq = BeanUtils.toBean(pageReqVO, TicketManagementPageReqVO.class);
statisticsReq.setPlanType(null);
statisticsReq.setJobStatus(null);
applyDeviceLedgerFilter(statisticsReq);
List<TicketManagementDO> allList = ticketManagementMapper.selectList(statisticsReq);
respVO.setAllCount((long) allList.size());
respVO.setInspectCount(allList.stream().filter(item -> item.getPlanType() == 1).count());

Write Preview
Loading…
Cancel
Save