diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java index 1a97cc1..de1506e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/MesProWorkorderPageReqVO.java @@ -26,21 +26,12 @@ public class MesProWorkOrderPageReqVO extends PageParam { @Schema(description = "工单类型", example = "1") private Integer type; - @Schema(description = "来源类型", example = "1") - private Integer orderSourceType; - @Schema(description = "产品编号", example = "100") private Long productId; @Schema(description = "客户编号", example = "300") private Long clientId; - @Schema(description = "批次号", example = "BATCH-001") - private String batchCode; - - @Schema(description = "工单状态", example = "0") - private Integer status; - @Schema(description = "需求日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] requestDate; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java index 2af2a1b..e623e32 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkorderMapper.java @@ -20,11 +20,8 @@ public interface MesProWorkOrderMapper extends BaseMapperX { .likeIfPresent(MesProWorkOrderDO::getCode, reqVO.getCode()) .likeIfPresent(MesProWorkOrderDO::getName, reqVO.getName()) .eqIfPresent(MesProWorkOrderDO::getType, reqVO.getType()) - .eqIfPresent(MesProWorkOrderDO::getOrderSourceType, reqVO.getOrderSourceType()) .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId()) .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId()) - .likeIfPresent(MesProWorkOrderDO::getBatchCode, reqVO.getBatchCode()) - .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus()) .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate()) .orderByDesc(MesProWorkOrderDO::getId)); }