Commit 568d3518d9444a21d539f57e7bec4464dea64374
1 parent
1be6bcfe
📝 docs(request): 更新请求VO文档,修正字段描述与添加缺失字段
Showing
7 changed files
with
21 additions
and
7 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineSaveReqVO.java
| @@ -7,7 +7,7 @@ import lombok.Data; | @@ -7,7 +7,7 @@ import lombok.Data; | ||
| 7 | 7 | ||
| 8 | import java.math.BigDecimal; | 8 | import java.math.BigDecimal; |
| 9 | 9 | ||
| 10 | -@Schema(description = "管理后台 - MES 产品收货单行新增/修改 Request VO") | 10 | +@Schema(description = "管理后台 - MES 产品入库单行新增/修改 Request VO") |
| 11 | @Data | 11 | @Data |
| 12 | public class MesWmProductReceiptLineSaveReqVO { | 12 | public class MesWmProductReceiptLineSaveReqVO { |
| 13 | 13 |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/detail/MesWmReturnSalesDetailSaveReqVO.java
| @@ -39,6 +39,9 @@ public class MesWmReturnSalesDetailSaveReqVO { | @@ -39,6 +39,9 @@ public class MesWmReturnSalesDetailSaveReqVO { | ||
| 39 | @Schema(description = "批次ID", example = "1") | 39 | @Schema(description = "批次ID", example = "1") |
| 40 | private Long batchId; | 40 | private Long batchId; |
| 41 | 41 | ||
| 42 | + @Schema(description = "批次号", example = "B20250101") | ||
| 43 | + private String batchCode; | ||
| 44 | + | ||
| 42 | @Schema(description = "仓库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | 45 | @Schema(description = "仓库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 43 | @NotNull(message = "仓库ID不能为空") | 46 | @NotNull(message = "仓库ID不能为空") |
| 44 | private Long warehouseId; | 47 | private Long warehouseId; |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/line/MesWmReturnSalesLineSaveReqVO.java
| @@ -32,9 +32,12 @@ public class MesWmReturnSalesLineSaveReqVO { | @@ -32,9 +32,12 @@ public class MesWmReturnSalesLineSaveReqVO { | ||
| 32 | @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0") | 32 | @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0") |
| 33 | private BigDecimal quantity; | 33 | private BigDecimal quantity; |
| 34 | 34 | ||
| 35 | - @Schema(description = "批次号", example = "B20250101") | 35 | + @Schema(description = "批次ID", example = "1") |
| 36 | private Long batchId; | 36 | private Long batchId; |
| 37 | 37 | ||
| 38 | + @Schema(description = "批次号", example = "B20250101") | ||
| 39 | + private String batchCode; | ||
| 40 | + | ||
| 38 | @Schema(description = "是否需要质检", example = "true") | 41 | @Schema(description = "是否需要质检", example = "true") |
| 39 | private Boolean rqcCheckFlag; | 42 | private Boolean rqcCheckFlag; |
| 40 | 43 |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java
| @@ -51,16 +51,15 @@ public class MesWmProductSalesDO extends BaseDO { | @@ -51,16 +51,15 @@ public class MesWmProductSalesDO extends BaseDO { | ||
| 51 | */ | 51 | */ |
| 52 | private String salesOrderCode; | 52 | private String salesOrderCode; |
| 53 | /** | 53 | /** |
| 54 | - * 出库日期 | ||
| 55 | - */ | ||
| 56 | - private LocalDateTime salesDate; | ||
| 57 | - | ||
| 58 | - /** | ||
| 59 | * 发货通知单 ID | 54 | * 发货通知单 ID |
| 60 | * | 55 | * |
| 61 | * 关联 {@link MesWmSalesNoticeDO#getId()} | 56 | * 关联 {@link MesWmSalesNoticeDO#getId()} |
| 62 | */ | 57 | */ |
| 63 | private Long noticeId; | 58 | private Long noticeId; |
| 59 | + /** | ||
| 60 | + * 出库日期 | ||
| 61 | + */ | ||
| 62 | + private LocalDateTime salesDate; | ||
| 64 | 63 | ||
| 65 | /** | 64 | /** |
| 66 | * 联系人 | 65 | * 联系人 |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDetailDO.java
| @@ -59,6 +59,10 @@ public class MesWmReturnSalesDetailDO extends BaseDO { | @@ -59,6 +59,10 @@ public class MesWmReturnSalesDetailDO extends BaseDO { | ||
| 59 | */ | 59 | */ |
| 60 | private Long batchId; | 60 | private Long batchId; |
| 61 | /** | 61 | /** |
| 62 | + * 批次号 | ||
| 63 | + */ | ||
| 64 | + private String batchCode; | ||
| 65 | + /** | ||
| 62 | * 仓库 ID | 66 | * 仓库 ID |
| 63 | * | 67 | * |
| 64 | * 关联 {@link MesWmWarehouseDO#getId()} | 68 | * 关联 {@link MesWmWarehouseDO#getId()} |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java
| @@ -51,6 +51,10 @@ public class MesWmReturnSalesLineDO extends BaseDO { | @@ -51,6 +51,10 @@ public class MesWmReturnSalesLineDO extends BaseDO { | ||
| 51 | */ | 51 | */ |
| 52 | private Long batchId; | 52 | private Long batchId; |
| 53 | /** | 53 | /** |
| 54 | + * 批次号 | ||
| 55 | + */ | ||
| 56 | + private String batchCode; | ||
| 57 | + /** | ||
| 54 | * 退货检验单 ID | 58 | * 退货检验单 ID |
| 55 | */ | 59 | */ |
| 56 | private Long rqcId; | 60 | private Long rqcId; |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueServiceImpl.java
| @@ -132,6 +132,7 @@ public class MesWmMiscIssueServiceImpl implements MesWmMiscIssueService { | @@ -132,6 +132,7 @@ public class MesWmMiscIssueServiceImpl implements MesWmMiscIssueService { | ||
| 132 | wmTransactionService.createTransactionList(convertList(lines, line -> new MesWmTransactionSaveReqDTO() | 132 | wmTransactionService.createTransactionList(convertList(lines, line -> new MesWmTransactionSaveReqDTO() |
| 133 | .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(line.getItemId()) | 133 | .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(line.getItemId()) |
| 134 | .setQuantity(line.getQuantity().negate()) // 出库数量为负数 | 134 | .setQuantity(line.getQuantity().negate()) // 出库数量为负数 |
| 135 | + .setBatchId(line.getBatchId()).setBatchCode(line.getBatchCode()) | ||
| 135 | .setWarehouseId(line.getWarehouseId()).setLocationId(line.getLocationId()).setAreaId(line.getAreaId()) | 136 | .setWarehouseId(line.getWarehouseId()).setLocationId(line.getLocationId()).setAreaId(line.getAreaId()) |
| 136 | .setBizType(MesBizTypeConstants.WM_MISC_ISSUE).setBizId(issue.getId()).setBizCode(issue.getCode()).setBizLineId(line.getId()))); | 137 | .setBizType(MesBizTypeConstants.WM_MISC_ISSUE).setBizId(issue.getId()).setBizCode(issue.getCode()).setBizLineId(line.getId()))); |
| 137 | } | 138 | } |