diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueRespVO.java index a34af94..570ba2b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueRespVO.java @@ -18,18 +18,18 @@ public class MesWmProductionIssueRespVO { @Schema(description = "领料单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产领料") private String name; - @Schema(description = "工作站 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Long workOrderId; + + @Schema(description = "生产工单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "WO20250226001") + private String workOrderCode; + + @Schema(description = "工作站 ID", example = "1") private Long workstationId; @Schema(description = "工作站名称", example = "装配工作站") private String workstationName; - @Schema(description = "生产工单 ID", example = "1") - private Long workOrderId; - - @Schema(description = "生产工单编号", example = "WO20250226001") - private String workOrderCode; - @Schema(description = "生产任务 ID", example = "1") private Long taskId; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueSaveReqVO.java index 729b211..c553168 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/MesWmProductionIssueSaveReqVO.java @@ -22,14 +22,13 @@ public class MesWmProductionIssueSaveReqVO { @NotBlank(message = "领料单名称不能为空") private String name; - @Schema(description = "工作站 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "工作站 ID 不能为空") - private Long workstationId; - @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "生产工单 ID 不能为空") private Long workOrderId; + @Schema(description = "工作站 ID", example = "1") + private Long workstationId; + @Schema(description = "需求时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "需求时间不能为空") private LocalDateTime requiredTime; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailRespVO.java index a1c3ac2..a31fdf1 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailRespVO.java @@ -43,6 +43,9 @@ public class MesWmProductionIssueDetailRespVO { @Schema(description = "批次编号", example = "1") private Long batchId; + @Schema(description = "批次号", example = "BATCH20260101001") + private String batchCode; + @Schema(description = "仓库编号", example = "1") private Long warehouseId; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailSaveReqVO.java index cb7d7b3..347c796 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productionissue/vo/detail/MesWmProductionIssueDetailSaveReqVO.java @@ -32,6 +32,9 @@ public class MesWmProductionIssueDetailSaveReqVO { @Schema(description = "批次编号", example = "1") private Long batchId; + @Schema(description = "批次号", example = "BATCH20260101001") + private String batchCode; + @Schema(description = "库存记录编号", example = "1") private Long materialStockId; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productionissue/MesWmProductionIssueDetailDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productionissue/MesWmProductionIssueDetailDO.java index e61b4f8..c22ee0c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productionissue/MesWmProductionIssueDetailDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productionissue/MesWmProductionIssueDetailDO.java @@ -64,6 +64,10 @@ public class MesWmProductionIssueDetailDO extends BaseDO { */ private Long batchId; /** + * 批次号 + */ + private String batchCode; + /** * 仓库ID * * 关联 {@link MesWmWarehouseDO#getId()}