Commit 297d30fc19eac6bfc3dc73ca5fb67e2145828509
1 parent
32e1b772
✨ feat(mes): 添加库存记录编号的非空校验
Showing
2 changed files
with
8 additions
and
9 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/vo/line/MesWmTransferLineSaveReqVO.java
| @@ -18,7 +18,8 @@ public class MesWmTransferLineSaveReqVO { | @@ -18,7 +18,8 @@ public class MesWmTransferLineSaveReqVO { | ||
| 18 | @NotNull(message = "转移单编号不能为空") | 18 | @NotNull(message = "转移单编号不能为空") |
| 19 | private Long transferId; | 19 | private Long transferId; |
| 20 | 20 | ||
| 21 | - @Schema(description = "库存记录编号", example = "1") | 21 | + @Schema(description = "库存记录编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 22 | + @NotNull(message = "库存记录编号不能为空") | ||
| 22 | private Long materialStockId; | 23 | private Long materialStockId; |
| 23 | 24 | ||
| 24 | @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | 25 | @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferLineServiceImpl.java
| @@ -114,14 +114,12 @@ public class MesWmTransferLineServiceImpl implements MesWmTransferLineService { | @@ -114,14 +114,12 @@ public class MesWmTransferLineServiceImpl implements MesWmTransferLineService { | ||
| 114 | warehouseAreaService.validateWarehouseAreaExists(reqVO.getFromWarehouseId(), | 114 | warehouseAreaService.validateWarehouseAreaExists(reqVO.getFromWarehouseId(), |
| 115 | reqVO.getFromLocationId(), reqVO.getFromAreaId()); | 115 | reqVO.getFromLocationId(), reqVO.getFromAreaId()); |
| 116 | // 校验库存记录存在,且转移数量不超过库存数量 | 116 | // 校验库存记录存在,且转移数量不超过库存数量 |
| 117 | - if (reqVO.getMaterialStockId() != null) { | ||
| 118 | - MesWmMaterialStockDO stock = materialStockService.getMaterialStock(reqVO.getMaterialStockId()); | ||
| 119 | - if (stock == null) { | ||
| 120 | - throw exception(WM_MATERIAL_STOCK_NOT_EXISTS); | ||
| 121 | - } | ||
| 122 | - if (stock.getQuantity() != null && reqVO.getQuantity().compareTo(stock.getQuantity()) > 0) { | ||
| 123 | - throw exception(WM_TRANSFER_LINE_QUANTITY_EXCEED_STOCK); | ||
| 124 | - } | 117 | + MesWmMaterialStockDO stock = materialStockService.getMaterialStock(reqVO.getMaterialStockId()); |
| 118 | + if (stock == null) { | ||
| 119 | + throw exception(WM_MATERIAL_STOCK_NOT_EXISTS); | ||
| 120 | + } | ||
| 121 | + if (stock.getQuantity() != null && reqVO.getQuantity().compareTo(stock.getQuantity()) > 0) { | ||
| 122 | + throw exception(WM_TRANSFER_LINE_QUANTITY_EXCEED_STOCK); | ||
| 125 | } | 123 | } |
| 126 | } | 124 | } |
| 127 | 125 |