BJ_ZTEITS-Developers / parking-cloud-yudao

Commit a5e130d123956038364acdcf97c2e8aa5873967f

Authored by YunaiV
1 parent fab2d60c

✨ feat(vo): 更新多个 VO 类以添加和调整字段描述

Inline Side-by-side
Showing 18 changed files with 105 additions and 112 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardRespVO.java
  View file @a5e130d
@@ -32,13 +32,13 @@ public class MesProCardRespVO { @@ -32,13 +32,13 @@ public class MesProCardRespVO {
32 @ExcelProperty("工单名称") 32 @ExcelProperty("工单名称")
33 private String workOrderName; 33 private String workOrderName;
34 34
  35 + @Schema(description = "产品物料编号", example = "200")
  36 + private Long itemId;
  37 +
35 @Schema(description = "批次号", example = "BATCH-001") 38 @Schema(description = "批次号", example = "BATCH-001")
36 @ExcelProperty("批次号") 39 @ExcelProperty("批次号")
37 private String batchCode; 40 private String batchCode;
38 41
39 - @Schema(description = "产品物料编号", example = "200")  
40 - private Long itemId;  
41 -  
42 @Schema(description = "产品编码", example = "P-001") 42 @Schema(description = "产品编码", example = "P-001")
43 @ExcelProperty("产品编码") 43 @ExcelProperty("产品编码")
44 private String itemCode; 44 private String itemCode;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/vo/MesProCardSaveReqVO.java
  View file @a5e130d
@@ -22,13 +22,13 @@ public class MesProCardSaveReqVO { @@ -22,13 +22,13 @@ public class MesProCardSaveReqVO {
22 @NotNull(message = "生产工单不能为空") 22 @NotNull(message = "生产工单不能为空")
23 private Long workOrderId; 23 private Long workOrderId;
24 24
25 - @Schema(description = "批次号", example = "BATCH-001")  
26 - private String batchCode;  
27 -  
28 @Schema(description = "产品物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") 25 @Schema(description = "产品物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
29 @NotNull(message = "产品物料不能为空") 26 @NotNull(message = "产品物料不能为空")
30 private Long itemId; 27 private Long itemId;
31 28
  29 + @Schema(description = "批次号", example = "BATCH-001")
  30 + private String batchCode;
  31 +
32 @Schema(description = "流转数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") 32 @Schema(description = "流转数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
33 @NotNull(message = "流转数量不能为空") 33 @NotNull(message = "流转数量不能为空")
34 private BigDecimal transferedQuantity; 34 private BigDecimal transferedQuantity;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueRespVO.java
  View file @a5e130d
@@ -22,21 +22,21 @@ public class MesProTaskIssueRespVO { @@ -22,21 +22,21 @@ public class MesProTaskIssueRespVO {
22 @Schema(description = "工作站编号", example = "1") 22 @Schema(description = "工作站编号", example = "1")
23 private Long workstationId; 23 private Long workstationId;
24 24
  25 + @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
  26 + private String sourceDocType;
  27 +
25 @Schema(description = "来源单据编号", example = "1") 28 @Schema(description = "来源单据编号", example = "1")
26 private Long sourceDocId; 29 private Long sourceDocId;
27 30
  31 + @Schema(description = "来源单据行编号", example = "1")
  32 + private Long sourceLineId;
  33 +
28 @Schema(description = "来源单据编码", example = "DOC-001") 34 @Schema(description = "来源单据编码", example = "DOC-001")
29 private String sourceDocCode; 35 private String sourceDocCode;
30 36
31 - @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")  
32 - private String sourceDocType;  
33 -  
34 @Schema(description = "投料批次", example = "BATCH-001") 37 @Schema(description = "投料批次", example = "BATCH-001")
35 private String batchCode; 38 private String batchCode;
36 39
37 - @Schema(description = "来源单据行编号", example = "1")  
38 - private Long sourceLineId;  
39 -  
40 @Schema(description = "产品物料编号", example = "100") 40 @Schema(description = "产品物料编号", example = "100")
41 private Long itemId; 41 private Long itemId;
42 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/vo/MesProTaskIssueSaveReqVO.java
  View file @a5e130d
@@ -23,22 +23,22 @@ public class MesProTaskIssueSaveReqVO { @@ -23,22 +23,22 @@ public class MesProTaskIssueSaveReqVO {
23 @Schema(description = "工作站编号", example = "1") 23 @Schema(description = "工作站编号", example = "1")
24 private Long workstationId; 24 private Long workstationId;
25 25
  26 + @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
  27 + private String sourceDocType;
  28 +
26 @Schema(description = "来源单据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 29 @Schema(description = "来源单据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
27 @NotNull(message = "来源单据编号不能为空") 30 @NotNull(message = "来源单据编号不能为空")
28 private Long sourceDocId; 31 private Long sourceDocId;
29 32
  33 + @Schema(description = "来源单据行编号", example = "1")
  34 + private Long sourceLineId;
  35 +
30 @Schema(description = "来源单据编码", example = "DOC-001") 36 @Schema(description = "来源单据编码", example = "DOC-001")
31 private String sourceDocCode; 37 private String sourceDocCode;
32 38
33 - @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")  
34 - private String sourceDocType;  
35 -  
36 @Schema(description = "投料批次", example = "BATCH-001") 39 @Schema(description = "投料批次", example = "BATCH-001")
37 private String batchCode; 40 private String batchCode;
38 41
39 - @Schema(description = "来源单据行编号", example = "1")  
40 - private Long sourceLineId;  
41 -  
42 @Schema(description = "产品物料编号", example = "100") 42 @Schema(description = "产品物料编号", example = "100")
43 private Long itemId; 43 private Long itemId;
44 44
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/vo/MesQcIpqcRespVO.java
  View file @a5e130d
@@ -34,12 +34,12 @@ public class MesQcIpqcRespVO { @@ -34,12 +34,12 @@ public class MesQcIpqcRespVO {
34 34
35 // ========== 来源单据 ========== 35 // ========== 来源单据 ==========
36 36
37 - @Schema(description = "来源单据 ID", example = "200")  
38 - private Long sourceDocId;  
39 -  
40 @Schema(description = "来源单据类型", example = "304") 37 @Schema(description = "来源单据类型", example = "304")
41 private Integer sourceDocType; 38 private Integer sourceDocType;
42 39
  40 + @Schema(description = "来源单据 ID", example = "200")
  41 + private Long sourceDocId;
  42 +
43 @Schema(description = "来源单据行 ID", example = "300") 43 @Schema(description = "来源单据行 ID", example = "300")
44 private Long sourceLineId; 44 private Long sourceLineId;
45 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/vo/MesQcIqcRespVO.java
  View file @a5e130d
@@ -30,12 +30,12 @@ public class MesQcIqcRespVO { @@ -30,12 +30,12 @@ public class MesQcIqcRespVO {
30 30
31 // ========== 来源单据 ========== 31 // ========== 来源单据 ==========
32 32
33 - @Schema(description = "来源单据 ID", example = "200")  
34 - private Long sourceDocId;  
35 -  
36 @Schema(description = "来源单据类型", example = "100") 33 @Schema(description = "来源单据类型", example = "100")
37 private Integer sourceDocType; 34 private Integer sourceDocType;
38 35
  36 + @Schema(description = "来源单据 ID", example = "200")
  37 + private Long sourceDocId;
  38 +
39 @Schema(description = "来源单据行 ID", example = "300") 39 @Schema(description = "来源单据行 ID", example = "300")
40 private Long sourceLineId; 40 private Long sourceLineId;
41 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
  View file @a5e130d
@@ -30,12 +30,12 @@ public class MesQcOqcRespVO { @@ -30,12 +30,12 @@ public class MesQcOqcRespVO {
30 30
31 // ========== 来源单据 ========== 31 // ========== 来源单据 ==========
32 32
33 - @Schema(description = "来源单据 ID", example = "200")  
34 - private Long sourceDocId;  
35 -  
36 @Schema(description = "来源单据类型", example = "118") 33 @Schema(description = "来源单据类型", example = "118")
37 private Integer sourceDocType; 34 private Integer sourceDocType;
38 35
  36 + @Schema(description = "来源单据 ID", example = "200")
  37 + private Long sourceDocId;
  38 +
39 @Schema(description = "来源单据行 ID", example = "300") 39 @Schema(description = "来源单据行 ID", example = "300")
40 private Long sourceLineId; 40 private Long sourceLineId;
41 41
@@ -51,12 +51,12 @@ public class MesQcOqcRespVO { @@ -51,12 +51,12 @@ public class MesQcOqcRespVO {
51 @ExcelProperty("客户简称") 51 @ExcelProperty("客户简称")
52 private String clientNickname; 52 private String clientNickname;
53 53
  54 + // ========== 物料 ==========
  55 +
54 @Schema(description = "批次号", example = "BC20250101") 56 @Schema(description = "批次号", example = "BC20250101")
55 @ExcelProperty("批次号") 57 @ExcelProperty("批次号")
56 private String batchCode; 58 private String batchCode;
57 59
58 - // ========== 物料 ==========  
59 -  
60 @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") 60 @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
61 private Long itemId; 61 private Long itemId;
62 62
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcSaveReqVO.java
  View file @a5e130d
@@ -26,12 +26,12 @@ public class MesQcOqcSaveReqVO { @@ -26,12 +26,12 @@ public class MesQcOqcSaveReqVO {
26 26
27 // ========== 来源单据 ========== 27 // ========== 来源单据 ==========
28 28
29 - @Schema(description = "来源单据 ID", example = "200")  
30 - private Long sourceDocId;  
31 -  
32 @Schema(description = "来源单据类型", example = "118") 29 @Schema(description = "来源单据类型", example = "118")
33 private Integer sourceDocType; 30 private Integer sourceDocType;
34 31
  32 + @Schema(description = "来源单据 ID", example = "200")
  33 + private Long sourceDocId;
  34 +
35 @Schema(description = "来源单据行 ID", example = "300") 35 @Schema(description = "来源单据行 ID", example = "300")
36 private Long sourceLineId; 36 private Long sourceLineId;
37 37
@@ -41,11 +41,11 @@ public class MesQcOqcSaveReqVO { @@ -41,11 +41,11 @@ public class MesQcOqcSaveReqVO {
41 @NotNull(message = "客户不能为空") 41 @NotNull(message = "客户不能为空")
42 private Long clientId; 42 private Long clientId;
43 43
  44 + // ========== 物料 ==========
  45 +
44 @Schema(description = "批次号", example = "BC20250101") 46 @Schema(description = "批次号", example = "BC20250101")
45 private String batchCode; 47 private String batchCode;
46 48
47 - // ========== 物料 ==========  
48 -  
49 @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") 49 @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
50 @NotNull(message = "产品物料不能为空") 50 @NotNull(message = "产品物料不能为空")
51 private Long itemId; 51 private Long itemId;
@@ -74,9 +74,8 @@ public class MesQcOqcSaveReqVO { @@ -74,9 +74,8 @@ public class MesQcOqcSaveReqVO {
74 74
75 // ========== 检验 ========== 75 // ========== 检验 ==========
76 76
77 - @Schema(description = "检测人员用户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")  
78 - @NotNull(message = "检测人员不能为空")  
79 - private Long inspectorUserId; 77 + @Schema(description = "检测结果", example = "1")
  78 + private Integer checkResult;
80 79
81 @Schema(description = "出货日期", requiredMode = Schema.RequiredMode.REQUIRED) 80 @Schema(description = "出货日期", requiredMode = Schema.RequiredMode.REQUIRED)
82 @NotNull(message = "出货日期不能为空") 81 @NotNull(message = "出货日期不能为空")
@@ -86,8 +85,9 @@ public class MesQcOqcSaveReqVO { @@ -86,8 +85,9 @@ public class MesQcOqcSaveReqVO {
86 @NotNull(message = "检测日期不能为空") 85 @NotNull(message = "检测日期不能为空")
87 private LocalDateTime inspectDate; 86 private LocalDateTime inspectDate;
88 87
89 - @Schema(description = "检测结果", example = "1")  
90 - private Integer checkResult; 88 + @Schema(description = "检测人员用户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  89 + @NotNull(message = "检测人员不能为空")
  90 + private Long inspectorUserId;
91 91
92 @Schema(description = "备注", example = "备注") 92 @Schema(description = "备注", example = "备注")
93 private String remark; 93 private String remark;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/pendinginspect/vo/MesQcPendingInspectRespVO.java
  View file @a5e130d
@@ -10,17 +10,16 @@ import java.time.LocalDateTime; @@ -10,17 +10,16 @@ import java.time.LocalDateTime;
10 @Data 10 @Data
11 public class MesQcPendingInspectRespVO { 11 public class MesQcPendingInspectRespVO {
12 12
13 - @Schema(description = "来源单据 ID", example = "100")  
14 - private Long sourceDocId;  
15 -  
16 @Schema(description = "来源单据类型（MesBizTypeConstants）", example = "100") 13 @Schema(description = "来源单据类型（MesBizTypeConstants）", example = "100")
17 private Integer sourceDocType; 14 private Integer sourceDocType;
18 15
19 - @Schema(description = "来源单据编号", example = "AN2025001")  
20 - private String sourceDocCode; 16 + @Schema(description = "来源单据 ID", example = "100")
  17 + private Long sourceDocId;
21 18
22 @Schema(description = "来源单据行 ID", example = "200") 19 @Schema(description = "来源单据行 ID", example = "200")
23 private Long sourceLineId; 20 private Long sourceLineId;
  21 + @Schema(description = "来源单据编号", example = "AN2025001")
  22 + private String sourceDocCode;
24 23
25 @Schema(description = "检验类型（MesQcTypeEnum）", example = "1") 24 @Schema(description = "检验类型（MesQcTypeEnum）", example = "1")
26 private Integer qcType; 25 private Integer qcType;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcRespVO.java
  View file @a5e130d
@@ -30,12 +30,12 @@ public class MesQcRqcRespVO { @@ -30,12 +30,12 @@ public class MesQcRqcRespVO {
30 30
31 // ========== 来源单据 ========== 31 // ========== 来源单据 ==========
32 32
33 - @Schema(description = "来源单据 ID", example = "200")  
34 - private Long sourceDocId;  
35 -  
36 @Schema(description = "来源单据类型", example = "116") 33 @Schema(description = "来源单据类型", example = "116")
37 private Integer sourceDocType; 34 private Integer sourceDocType;
38 35
  36 + @Schema(description = "来源单据 ID", example = "200")
  37 + private Long sourceDocId;
  38 +
39 @Schema(description = "来源单据行 ID", example = "300") 39 @Schema(description = "来源单据行 ID", example = "300")
40 private Long sourceLineId; 40 private Long sourceLineId;
41 41
@@ -85,6 +85,26 @@ public class MesQcRqcRespVO { @@ -85,6 +85,26 @@ public class MesQcRqcRespVO {
85 @ExcelProperty("不合格数量") 85 @ExcelProperty("不合格数量")
86 private BigDecimal unqualifiedQuantity; 86 private BigDecimal unqualifiedQuantity;
87 87
  88 + // ========== 缺陷统计 ==========
  89 +
  90 + @Schema(description = "致命缺陷率（%）", example = "5.00")
  91 + private BigDecimal criticalRate;
  92 +
  93 + @Schema(description = "严重缺陷率（%）", example = "10.00")
  94 + private BigDecimal majorRate;
  95 +
  96 + @Schema(description = "轻微缺陷率（%）", example = "15.00")
  97 + private BigDecimal minorRate;
  98 +
  99 + @Schema(description = "致命缺陷数量", example = "5")
  100 + private Integer criticalQuantity;
  101 +
  102 + @Schema(description = "严重缺陷数量", example = "10")
  103 + private Integer majorQuantity;
  104 +
  105 + @Schema(description = "轻微缺陷数量", example = "15")
  106 + private Integer minorQuantity;
  107 +
88 // ========== 检验 ========== 108 // ========== 检验 ==========
89 109
90 @Schema(description = "检测结果", example = "1") 110 @Schema(description = "检测结果", example = "1")
@@ -110,26 +130,6 @@ public class MesQcRqcRespVO { @@ -110,26 +130,6 @@ public class MesQcRqcRespVO {
110 @ExcelProperty("备注") 130 @ExcelProperty("备注")
111 private String remark; 131 private String remark;
112 132
113 - // ========== 缺陷统计 ==========  
114 -  
115 - @Schema(description = "致命缺陷数量", example = "5")  
116 - private Integer criticalQuantity;  
117 -  
118 - @Schema(description = "严重缺陷数量", example = "10")  
119 - private Integer majorQuantity;  
120 -  
121 - @Schema(description = "轻微缺陷数量", example = "15")  
122 - private Integer minorQuantity;  
123 -  
124 - @Schema(description = "致命缺陷率（%）", example = "5.00")  
125 - private BigDecimal criticalRate;  
126 -  
127 - @Schema(description = "严重缺陷率（%）", example = "10.00")  
128 - private BigDecimal majorRate;  
129 -  
130 - @Schema(description = "轻微缺陷率（%）", example = "15.00")  
131 - private BigDecimal minorRate;  
132 -  
133 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 133 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
134 @ExcelProperty("创建时间") 134 @ExcelProperty("创建时间")
135 private LocalDateTime createTime; 135 private LocalDateTime createTime;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/vo/MesQcRqcSaveReqVO.java
  View file @a5e130d
@@ -32,12 +32,12 @@ public class MesQcRqcSaveReqVO { @@ -32,12 +32,12 @@ public class MesQcRqcSaveReqVO {
32 32
33 // ========== 来源单据 ========== 33 // ========== 来源单据 ==========
34 34
35 - @Schema(description = "来源单据 ID", example = "200")  
36 - private Long sourceDocId;  
37 -  
38 @Schema(description = "来源单据类型", example = "116") 35 @Schema(description = "来源单据类型", example = "116")
39 private Integer sourceDocType; 36 private Integer sourceDocType;
40 37
  38 + @Schema(description = "来源单据 ID", example = "200")
  39 + private Long sourceDocId;
  40 +
41 @Schema(description = "来源单据行 ID", example = "300") 41 @Schema(description = "来源单据行 ID", example = "300")
42 private Long sourceLineId; 42 private Long sourceLineId;
43 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueRespVO.java
  View file @a5e130d
@@ -21,15 +21,14 @@ public class MesWmMiscIssueRespVO { @@ -21,15 +21,14 @@ public class MesWmMiscIssueRespVO {
21 @Schema(description = "杂项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 21 @Schema(description = "杂项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
22 private Integer type; 22 private Integer type;
23 23
  24 + @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
  25 + private String sourceDocType;
24 @Schema(description = "来源单据ID", example = "1") 26 @Schema(description = "来源单据ID", example = "1")
25 private Long sourceDocId; 27 private Long sourceDocId;
26 28
27 @Schema(description = "来源单据编号", example = "DOC20260302001") 29 @Schema(description = "来源单据编号", example = "DOC20260302001")
28 private String sourceDocCode; 30 private String sourceDocCode;
29 31
30 - @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")  
31 - private String sourceDocType;  
32 -  
33 @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED) 32 @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
34 private LocalDateTime issueDate; 33 private LocalDateTime issueDate;
35 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/vo/MesWmMiscIssueSaveReqVO.java
  View file @a5e130d
@@ -26,15 +26,14 @@ public class MesWmMiscIssueSaveReqVO { @@ -26,15 +26,14 @@ public class MesWmMiscIssueSaveReqVO {
26 @NotNull(message = "杂项类型不能为空") 26 @NotNull(message = "杂项类型不能为空")
27 private Integer type; 27 private Integer type;
28 28
  29 + @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
  30 + private String sourceDocType;
29 @Schema(description = "来源单据ID", example = "1") 31 @Schema(description = "来源单据ID", example = "1")
30 private Long sourceDocId; 32 private Long sourceDocId;
31 33
32 @Schema(description = "来源单据编号", example = "DOC20260302001") 34 @Schema(description = "来源单据编号", example = "DOC20260302001")
33 private String sourceDocCode; 35 private String sourceDocCode;
34 36
35 - @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")  
36 - private String sourceDocType;  
37 -  
38 @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED) 37 @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
39 @NotNull(message = "出库日期不能为空") 38 @NotNull(message = "出库日期不能为空")
40 private LocalDateTime issueDate; 39 private LocalDateTime issueDate;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptRespVO.java
  View file @a5e130d
@@ -21,15 +21,14 @@ public class MesWmMiscReceiptRespVO { @@ -21,15 +21,14 @@ public class MesWmMiscReceiptRespVO {
21 @Schema(description = "杂项类型", example = "1") 21 @Schema(description = "杂项类型", example = "1")
22 private Integer type; 22 private Integer type;
23 23
  24 + @Schema(description = "来源单据类型", example = "WORK_ORDER")
  25 + private String sourceDocType;
24 @Schema(description = "来源单据 ID", example = "1") 26 @Schema(description = "来源单据 ID", example = "1")
25 private Long sourceDocId; 27 private Long sourceDocId;
26 28
27 @Schema(description = "来源单据编码", example = "WO2026030001") 29 @Schema(description = "来源单据编码", example = "WO2026030001")
28 private String sourceDocCode; 30 private String sourceDocCode;
29 31
30 - @Schema(description = "来源单据类型", example = "WORK_ORDER")  
31 - private String sourceDocType;  
32 -  
33 @Schema(description = "入库日期") 32 @Schema(description = "入库日期")
34 private LocalDateTime receiptDate; 33 private LocalDateTime receiptDate;
35 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/vo/MesWmMiscReceiptSaveReqVO.java
  View file @a5e130d
@@ -26,15 +26,14 @@ public class MesWmMiscReceiptSaveReqVO { @@ -26,15 +26,14 @@ public class MesWmMiscReceiptSaveReqVO {
26 @NotNull(message = "杂项类型不能为空") 26 @NotNull(message = "杂项类型不能为空")
27 private Integer type; 27 private Integer type;
28 28
  29 + @Schema(description = "来源单据类型", example = "WORK_ORDER")
  30 + private String sourceDocType;
29 @Schema(description = "来源单据 ID", example = "1") 31 @Schema(description = "来源单据 ID", example = "1")
30 private Long sourceDocId; 32 private Long sourceDocId;
31 33
32 @Schema(description = "来源单据编码", example = "WO2026030001") 34 @Schema(description = "来源单据编码", example = "WO2026030001")
33 private String sourceDocCode; 35 private String sourceDocCode;
34 36
35 - @Schema(description = "来源单据类型", example = "WORK_ORDER")  
36 - private String sourceDocType;  
37 -  
38 @Schema(description = "入库日期", requiredMode = Schema.RequiredMode.REQUIRED) 37 @Schema(description = "入库日期", requiredMode = Schema.RequiredMode.REQUIRED)
39 @NotNull(message = "入库日期不能为空") 38 @NotNull(message = "入库日期不能为空")
40 private LocalDateTime receiptDate; 39 private LocalDateTime receiptDate;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java
  View file @a5e130d
@@ -14,21 +14,20 @@ public class MesWmReturnVendorDetailSaveReqVO { @@ -14,21 +14,20 @@ public class MesWmReturnVendorDetailSaveReqVO {
14 @Schema(description = "编号", example = "1024") 14 @Schema(description = "编号", example = "1024")
15 private Long id; 15 private Long id;
16 16
  17 + @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  18 + @NotNull(message = "退货单编号不能为空")
  19 + private Long returnId;
17 @Schema(description = "退货单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 20 @Schema(description = "退货单行编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
18 @NotNull(message = "退货单行编号不能为空") 21 @NotNull(message = "退货单行编号不能为空")
19 private Long lineId; 22 private Long lineId;
20 23
21 - @Schema(description = "退货单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")  
22 - @NotNull(message = "退货单编号不能为空")  
23 - private Long returnId; 24 + @Schema(description = "库存记录编号", example = "1")
  25 + private Long materialStockId;
24 26
25 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") 27 @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
26 @NotNull(message = "物料编号不能为空") 28 @NotNull(message = "物料编号不能为空")
27 private Long itemId; 29 private Long itemId;
28 30
29 - @Schema(description = "库存记录编号", example = "1")  
30 - private Long materialStockId;  
31 -  
32 @Schema(description = "退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00") 31 @Schema(description = "退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
33 @NotNull(message = "退货数量不能为空") 32 @NotNull(message = "退货数量不能为空")
34 @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0") 33 @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0")
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/rqc/MesQcRqcDO.java
  View file @a5e130d
@@ -51,16 +51,16 @@ public class MesQcRqcDO extends BaseDO { @@ -51,16 +51,16 @@ public class MesQcRqcDO extends BaseDO {
51 // ========== 来源单据 ========== 51 // ========== 来源单据 ==========
52 52
53 /** 53 /**
54 - * 来源单据 ID  
55 - */  
56 - private Long sourceDocId;  
57 - /**  
58 * 来源单据类型 54 * 来源单据类型
59 * 55 *
60 * 关联 {@link cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants} 56 * 关联 {@link cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants}
61 */ 57 */
62 private Integer sourceDocType; 58 private Integer sourceDocType;
63 /** 59 /**
  60 + * 来源单据 ID
  61 + */
  62 + private Long sourceDocId;
  63 + /**
64 * 来源单据行 ID 64 * 来源单据行 ID
65 */ 65 */
66 private Long sourceLineId; 66 private Long sourceLineId;
yudao-module-mes/src/test/resources/sql/create_tables.sql
  View file @a5e130d
@@ -381,7 +381,6 @@ CREATE TABLE IF NOT EXISTS "mes_wm_product_produce_detail" ( @@ -381,7 +381,6 @@ CREATE TABLE IF NOT EXISTS "mes_wm_product_produce_detail" (
381 PRIMARY KEY ("id") 381 PRIMARY KEY ("id")
382 ); 382 );
383 383
384 -  
385 -- ---------------------------- 384 -- ----------------------------
386 -- MES 出货检验单（OQC） 385 -- MES 出货检验单（OQC）
387 -- ---------------------------- 386 -- ----------------------------
@@ -390,8 +389,8 @@ CREATE TABLE IF NOT EXISTS "mes_qc_oqc" ( @@ -390,8 +389,8 @@ CREATE TABLE IF NOT EXISTS "mes_qc_oqc" (
390 "code" varchar(64) NOT NULL, 389 "code" varchar(64) NOT NULL,
391 "name" varchar(500) NOT NULL, 390 "name" varchar(500) NOT NULL,
392 "template_id" bigint NOT NULL, 391 "template_id" bigint NOT NULL,
393 - "source_doc_id" bigint DEFAULT NULL,  
394 "source_doc_type" int DEFAULT NULL, 392 "source_doc_type" int DEFAULT NULL,
  393 + "source_doc_id" bigint DEFAULT NULL,
395 "source_line_id" bigint DEFAULT NULL, 394 "source_line_id" bigint DEFAULT NULL,
396 "source_doc_code" varchar(64) DEFAULT NULL, 395 "source_doc_code" varchar(64) DEFAULT NULL,
397 "client_id" bigint NOT NULL, 396 "client_id" bigint NOT NULL,
@@ -432,8 +431,8 @@ CREATE TABLE IF NOT EXISTS "mes_qc_rqc" ( @@ -432,8 +431,8 @@ CREATE TABLE IF NOT EXISTS "mes_qc_rqc" (
432 "code" varchar(64) NOT NULL, 431 "code" varchar(64) NOT NULL,
433 "name" varchar(500) NOT NULL, 432 "name" varchar(500) NOT NULL,
434 "template_id" bigint NOT NULL, 433 "template_id" bigint NOT NULL,
435 - "source_doc_id" bigint DEFAULT NULL,  
436 "source_doc_type" int DEFAULT NULL, 434 "source_doc_type" int DEFAULT NULL,
  435 + "source_doc_id" bigint DEFAULT NULL,
437 "source_line_id" bigint DEFAULT NULL, 436 "source_line_id" bigint DEFAULT NULL,
438 "source_doc_code" varchar(64) DEFAULT NULL, 437 "source_doc_code" varchar(64) DEFAULT NULL,
439 "type" int DEFAULT NULL, 438 "type" int DEFAULT NULL,
@@ -442,17 +441,17 @@ CREATE TABLE IF NOT EXISTS "mes_qc_rqc" ( @@ -442,17 +441,17 @@ CREATE TABLE IF NOT EXISTS "mes_qc_rqc" (
442 "check_quantity" decimal(14,2) DEFAULT NULL, 441 "check_quantity" decimal(14,2) DEFAULT NULL,
443 "qualified_quantity" decimal(14,2) DEFAULT 0.00, 442 "qualified_quantity" decimal(14,2) DEFAULT 0.00,
444 "unqualified_quantity" decimal(14,2) DEFAULT 0.00, 443 "unqualified_quantity" decimal(14,2) DEFAULT 0.00,
  444 + "critical_rate" decimal(14,2) DEFAULT 0.00,
  445 + "major_rate" decimal(14,2) DEFAULT 0.00,
  446 + "minor_rate" decimal(14,2) DEFAULT 0.00,
  447 + "critical_quantity" int DEFAULT 0,
  448 + "major_quantity" int DEFAULT 0,
  449 + "minor_quantity" int DEFAULT 0,
445 "check_result" tinyint DEFAULT NULL, 450 "check_result" tinyint DEFAULT NULL,
446 "inspect_date" timestamp DEFAULT NULL, 451 "inspect_date" timestamp DEFAULT NULL,
447 "inspector_user_id" bigint DEFAULT NULL, 452 "inspector_user_id" bigint DEFAULT NULL,
448 "status" tinyint NOT NULL DEFAULT 0, 453 "status" tinyint NOT NULL DEFAULT 0,
449 "remark" varchar(500) DEFAULT '', 454 "remark" varchar(500) DEFAULT '',
450 - "critical_quantity" int DEFAULT 0,  
451 - "major_quantity" int DEFAULT 0,  
452 - "minor_quantity" int DEFAULT 0,  
453 - "critical_rate" decimal(14,2) DEFAULT 0.00,  
454 - "major_rate" decimal(14,2) DEFAULT 0.00,  
455 - "minor_rate" decimal(14,2) DEFAULT 0.00,  
456 "creator" varchar(64) DEFAULT '', 455 "creator" varchar(64) DEFAULT '',
457 "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 456 "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
458 "updater" varchar(64) DEFAULT '', 457 "updater" varchar(64) DEFAULT '',
@@ -706,17 +705,17 @@ CREATE TABLE IF NOT EXISTS "mes_wm_batch" ( @@ -706,17 +705,17 @@ CREATE TABLE IF NOT EXISTS "mes_wm_batch" (
706 -- ---------------------------- 705 -- ----------------------------
707 CREATE TABLE IF NOT EXISTS "mes_wm_material_stock" ( 706 CREATE TABLE IF NOT EXISTS "mes_wm_material_stock" (
708 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, 707 "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
709 - "quantity" decimal(14,2) DEFAULT NULL,  
710 - "receipt_time" timestamp DEFAULT NULL,  
711 - "vendor_id" bigint DEFAULT NULL,  
712 - "item_type_id" bigint DEFAULT NULL,  
713 - "item_id" bigint DEFAULT NULL,  
714 - "batch_id" bigint DEFAULT NULL,  
715 - "batch_code" varchar(255) DEFAULT NULL,  
716 - "warehouse_id" bigint DEFAULT NULL,  
717 - "location_id" bigint DEFAULT NULL,  
718 - "area_id" bigint DEFAULT NULL,  
719 - "frozen" bit DEFAULT FALSE, 708 + \"item_type_id\" bigint DEFAULT NULL,
  709 + \"item_id\" bigint DEFAULT NULL,
  710 + \"batch_id\" bigint DEFAULT NULL,
  711 + \"batch_code\" varchar(255) DEFAULT NULL,
  712 + \"warehouse_id\" bigint DEFAULT NULL,
  713 + \"location_id\" bigint DEFAULT NULL,
  714 + \"area_id\" bigint DEFAULT NULL,
  715 + \"vendor_id\" bigint DEFAULT NULL,
  716 + \"quantity\" decimal(14,2) DEFAULT NULL,
  717 + \"receipt_time\" timestamp DEFAULT NULL,
  718 + \"frozen\" bit DEFAULT FALSE,
720 "creator" varchar(64) DEFAULT '', 719 "creator" varchar(64) DEFAULT '',
721 "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 720 "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
722 "updater" varchar(64) DEFAULT '', 721 "updater" varchar(64) DEFAULT '',