Commit dc7afd47f606395026e9b247a25292b959fb5e5e

Authored by YunaiV
1 parent fc636c04

✨ feat(mes): 移除工单来源、批次号和工单状态字段,简化请求参数

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 { @@ -26,21 +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 orderSourceType;  
31 -  
32 @Schema(description = "产品编号", example = "100") 29 @Schema(description = "产品编号", example = "100")
33 private Long productId; 30 private Long productId;
34 31
35 @Schema(description = "客户编号", example = "300") 32 @Schema(description = "客户编号", example = "300")
36 private Long clientId; 33 private Long clientId;
37 34
38 - @Schema(description = "批次号", example = "BATCH-001")  
39 - private String batchCode;  
40 -  
41 - @Schema(description = "工单状态", example = "0")  
42 - private Integer status;  
43 -  
44 @Schema(description = "需求日期") 35 @Schema(description = "需求日期")
45 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) 36 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
46 private LocalDateTime[] requestDate; 37 private LocalDateTime[] requestDate;
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<MesProWorkOrderDO> { @@ -20,11 +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::getOrderSourceType, reqVO.getOrderSourceType())  
24 .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId()) 23 .eqIfPresent(MesProWorkOrderDO::getProductId, reqVO.getProductId())
25 .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId()) 24 .eqIfPresent(MesProWorkOrderDO::getClientId, reqVO.getClientId())
26 - .likeIfPresent(MesProWorkOrderDO::getBatchCode, reqVO.getBatchCode())  
27 - .eqIfPresent(MesProWorkOrderDO::getStatus, reqVO.getStatus())  
28 .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate()) 25 .betweenIfPresent(MesProWorkOrderDO::getRequestDate, reqVO.getRequestDate())
29 .orderByDesc(MesProWorkOrderDO::getId)); 26 .orderByDesc(MesProWorkOrderDO::getId));
30 } 27 }