BJ_ZTEITS-Developers / parking-cloud-yudao

Commit a6b7f4c70eee9ceaad02e378bf295a73cd07b3e4

Authored by YunaiV
1 parent d1d19393

✨ feat(mes): 添加工单状态和来源单据字段，优化查询功能

Inline Side-by-side
Showing 2 changed files with 8 additions and 0 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java
  View file @a6b7f4c
@@ -26,6 +26,12 @@ public class MesProWorkOrderPageReqVO extends PageParam { @@ -26,6 +26,12 @@ public class MesProWorkOrderPageReqVO extends PageParam {
26 @Schema(description = "工单类型", example = "1") 26 @Schema(description = "工单类型", example = "1")
27 private Integer type; 27 private Integer type;
28 28
  29 + @Schema(description = "工单状态", example = "1")
  30 + private Integer status;
  31 +
  32 + @Schema(description = "来源单据编号", example = "SO-001")
  33 + private String orderSourceCode;
  34 +
29 @Schema(description = "产品编号", example = "100") 35 @Schema(description = "产品编号", example = "100")
30 private Long productId; 36 private Long productId;
31 37
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java
  View file @a6b7f4c
@@ -20,6 +20,8 @@ public interface MesProWorkOrderMapper extends BaseMapperX<MesProWorkOrderDO> { @@ -20,6 +20,8 @@ public interface MesProWorkOrderMapper extends BaseMapperX<MesProWorkOrderDO> {
20 .likeIfPresent(MesProWorkOrderDO::getCode, reqVO.getCode()) 20 .likeIfPresent(MesProWorkOrderDO::getCode, reqVO.getCode())
21 .likeIfPresent(MesProWorkOrderDO::getName, reqVO.getName()) 21 .likeIfPresent(MesProWorkOrderDO::getName, reqVO.getName())
22 .eqIfPresent(MesProWorkOrderDO::getType, reqVO.getType()) 22 .eqIfPresent(MesProWorkOrderDO::getType, reqVO.getType())
  23 + .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus())
  24 + .likeIfPresent(MesProWorkOrderDO::getOrderSourceCode, reqVO.getOrderSourceCode())
23 .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId()) 25 .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId())
24 .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId()) 26 .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId())
25 .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate()) 27 .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate())