Commit 5738e2b8216f35e64bcf8ca1a102cc0cea13f5a4

Authored by YunaiV
1 parent efde9160

✨ feat(mes): 更新领料出库单相关 API 接口及组件

重命名领料出库单和明细相关的 API 方法,增强代码可读性。新增领料出库明细表单组件,支持拣货明细的添加与编辑功能。同时,调整相关组件的逻辑以适应新的 API 结构。
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 { @@ -18,18 +18,18 @@ public class MesWmProductionIssueRespVO {
18 @Schema(description = "领料单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产领料") 18 @Schema(description = "领料单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产领料")
19 private String name; 19 private String name;
20 20
21 - @Schema(description = "工作站 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 21 + @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  22 + private Long workOrderId;
  23 +
  24 + @Schema(description = "生产工单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "WO20250226001")
  25 + private String workOrderCode;
  26 +
  27 + @Schema(description = "工作站 ID", example = "1")
22 private Long workstationId; 28 private Long workstationId;
23 29
24 @Schema(description = "工作站名称", example = "装配工作站") 30 @Schema(description = "工作站名称", example = "装配工作站")
25 private String workstationName; 31 private String workstationName;
26 32
27 - @Schema(description = "生产工单 ID", example = "1")  
28 - private Long workOrderId;  
29 -  
30 - @Schema(description = "生产工单编号", example = "WO20250226001")  
31 - private String workOrderCode;  
32 -  
33 @Schema(description = "生产任务 ID", example = "1") 33 @Schema(description = "生产任务 ID", example = "1")
34 private Long taskId; 34 private Long taskId;
35 35
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 { @@ -22,14 +22,13 @@ public class MesWmProductionIssueSaveReqVO {
22 @NotBlank(message = "领料单名称不能为空") 22 @NotBlank(message = "领料单名称不能为空")
23 private String name; 23 private String name;
24 24
25 - @Schema(description = "工作站 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")  
26 - @NotNull(message = "工作站 ID 不能为空")  
27 - private Long workstationId;  
28 -  
29 @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 25 @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
30 @NotNull(message = "生产工单 ID 不能为空") 26 @NotNull(message = "生产工单 ID 不能为空")
31 private Long workOrderId; 27 private Long workOrderId;
32 28
  29 + @Schema(description = "工作站 ID", example = "1")
  30 + private Long workstationId;
  31 +
33 @Schema(description = "需求时间", requiredMode = Schema.RequiredMode.REQUIRED) 32 @Schema(description = "需求时间", requiredMode = Schema.RequiredMode.REQUIRED)
34 @NotNull(message = "需求时间不能为空") 33 @NotNull(message = "需求时间不能为空")
35 private LocalDateTime requiredTime; 34 private LocalDateTime requiredTime;
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 { @@ -43,6 +43,9 @@ public class MesWmProductionIssueDetailRespVO {
43 @Schema(description = "批次编号", example = "1") 43 @Schema(description = "批次编号", example = "1")
44 private Long batchId; 44 private Long batchId;
45 45
  46 + @Schema(description = "批次号", example = "BATCH20260101001")
  47 + private String batchCode;
  48 +
46 @Schema(description = "仓库编号", example = "1") 49 @Schema(description = "仓库编号", example = "1")
47 private Long warehouseId; 50 private Long warehouseId;
48 51
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 { @@ -32,6 +32,9 @@ public class MesWmProductionIssueDetailSaveReqVO {
32 @Schema(description = "批次编号", example = "1") 32 @Schema(description = "批次编号", example = "1")
33 private Long batchId; 33 private Long batchId;
34 34
  35 + @Schema(description = "批次号", example = "BATCH20260101001")
  36 + private String batchCode;
  37 +
35 @Schema(description = "库存记录编号", example = "1") 38 @Schema(description = "库存记录编号", example = "1")
36 private Long materialStockId; 39 private Long materialStockId;
37 40
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 { @@ -64,6 +64,10 @@ public class MesWmProductionIssueDetailDO extends BaseDO {
64 */ 64 */
65 private Long batchId; 65 private Long batchId;
66 /** 66 /**
  67 + * 批次号
  68 + */
  69 + private String batchCode;
  70 + /**
67 * 仓库ID 71 * 仓库ID
68 * 72 *
69 * 关联 {@link MesWmWarehouseDO#getId()} 73 * 关联 {@link MesWmWarehouseDO#getId()}