Commit 749651e8c2f60d55d47a7d10b5531c4b818a78dd
1 parent
1cea4e58
✨ feat(mes): 添加工艺路线编号字段,优化任务查询逻辑
Showing
2 changed files
with
4 additions
and
0 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskPageReqVO.java
| @@ -26,6 +26,9 @@ public class MesProTaskPageReqVO extends PageParam { | @@ -26,6 +26,9 @@ public class MesProTaskPageReqVO extends PageParam { | ||
| 26 | @Schema(description = "生产工单编号", example = "1") | 26 | @Schema(description = "生产工单编号", example = "1") |
| 27 | private Long workOrderId; | 27 | private Long workOrderId; |
| 28 | 28 | ||
| 29 | + @Schema(description = "工艺路线编号", example = "1") | ||
| 30 | + private Long routeId; | ||
| 31 | + | ||
| 29 | @Schema(description = "工序编号", example = "1") | 32 | @Schema(description = "工序编号", example = "1") |
| 30 | private Long processId; | 33 | private Long processId; |
| 31 | 34 |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
| @@ -22,6 +22,7 @@ public interface MesProTaskMapper extends BaseMapperX<MesProTaskDO> { | @@ -22,6 +22,7 @@ public interface MesProTaskMapper extends BaseMapperX<MesProTaskDO> { | ||
| 22 | .likeIfPresent(MesProTaskDO::getCode, reqVO.getCode()) | 22 | .likeIfPresent(MesProTaskDO::getCode, reqVO.getCode()) |
| 23 | .likeIfPresent(MesProTaskDO::getName, reqVO.getName()) | 23 | .likeIfPresent(MesProTaskDO::getName, reqVO.getName()) |
| 24 | .eqIfPresent(MesProTaskDO::getWorkOrderId, reqVO.getWorkOrderId()) | 24 | .eqIfPresent(MesProTaskDO::getWorkOrderId, reqVO.getWorkOrderId()) |
| 25 | + .eqIfPresent(MesProTaskDO::getRouteId, reqVO.getRouteId()) | ||
| 25 | .eqIfPresent(MesProTaskDO::getProcessId, reqVO.getProcessId()) | 26 | .eqIfPresent(MesProTaskDO::getProcessId, reqVO.getProcessId()) |
| 26 | .eqIfPresent(MesProTaskDO::getWorkstationId, reqVO.getWorkstationId()) | 27 | .eqIfPresent(MesProTaskDO::getWorkstationId, reqVO.getWorkstationId()) |
| 27 | .eqIfPresent(MesProTaskDO::getStatus, reqVO.getStatus()) | 28 | .eqIfPresent(MesProTaskDO::getStatus, reqVO.getStatus()) |