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
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 | 39 | @Schema(description = "批次ID", example = "1") |
| 40 | 40 | private Long batchId; |
| 41 | 41 | |
| 42 | + @Schema(description = "批次号", example = "B20250101") | |
| 43 | + private String batchCode; | |
| 44 | + | |
| 42 | 45 | @Schema(description = "仓库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 43 | 46 | @NotNull(message = "仓库ID不能为空") |
| 44 | 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 | 32 | @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0") |
| 33 | 33 | private BigDecimal quantity; |
| 34 | 34 | |
| 35 | - @Schema(description = "批次号", example = "B20250101") | |
| 35 | + @Schema(description = "批次ID", example = "1") | |
| 36 | 36 | private Long batchId; |
| 37 | 37 | |
| 38 | + @Schema(description = "批次号", example = "B20250101") | |
| 39 | + private String batchCode; | |
| 40 | + | |
| 38 | 41 | @Schema(description = "是否需要质检", example = "true") |
| 39 | 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 | 51 | */ |
| 52 | 52 | private String salesOrderCode; |
| 53 | 53 | /** |
| 54 | - * 出库日期 | |
| 55 | - */ | |
| 56 | - private LocalDateTime salesDate; | |
| 57 | - | |
| 58 | - /** | |
| 59 | 54 | * 发货通知单 ID |
| 60 | 55 | * |
| 61 | 56 | * 关联 {@link MesWmSalesNoticeDO#getId()} |
| 62 | 57 | */ |
| 63 | 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
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesLineDO.java
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 | 132 | wmTransactionService.createTransactionList(convertList(lines, line -> new MesWmTransactionSaveReqDTO() |
| 133 | 133 | .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(line.getItemId()) |
| 134 | 134 | .setQuantity(line.getQuantity().negate()) // 出库数量为负数 |
| 135 | + .setBatchId(line.getBatchId()).setBatchCode(line.getBatchCode()) | |
| 135 | 136 | .setWarehouseId(line.getWarehouseId()).setLocationId(line.getLocationId()).setAreaId(line.getAreaId()) |
| 136 | 137 | .setBizType(MesBizTypeConstants.WM_MISC_ISSUE).setBizId(issue.getId()).setBizCode(issue.getCode()).setBizLineId(line.getId()))); |
| 137 | 138 | } | ... | ... |