Commit 51d64e0802cc56ce949b5e88cb5bafc8076a4e16
1 parent
855e6f25
✨ feat(batch): 添加生产工单编号字段并重构选择器组件
Showing
3 changed files
with
5 additions
and
8 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
| @@ -96,13 +96,6 @@ public class MesWmBatchController { | @@ -96,13 +96,6 @@ public class MesWmBatchController { | ||
| 96 | return success(buildBatchRespVOList(list)); | 96 | return success(buildBatchRespVOList(list)); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | - @GetMapping("/simple-list") | ||
| 100 | - @Operation(summary = "获得批次精简列表", description = "主要用于前端下拉") | ||
| 101 | - public CommonResult<List<MesWmBatchRespVO>> getBatchSimpleList() { | ||
| 102 | - List<MesWmBatchDO> list = batchService.getBatchList(); | ||
| 103 | - return success(BeanUtils.toBean(list, MesWmBatchRespVO.class)); | ||
| 104 | - } | ||
| 105 | - | ||
| 106 | // ==================== 拼接 VO ==================== | 99 | // ==================== 拼接 VO ==================== |
| 107 | 100 | ||
| 108 | private List<MesWmBatchRespVO> buildBatchRespVOList(List<MesWmBatchDO> list) { | 101 | private List<MesWmBatchRespVO> buildBatchRespVOList(List<MesWmBatchDO> list) { |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchPageReqVO.java
| @@ -30,4 +30,7 @@ public class MesWmBatchPageReqVO extends PageParam { | @@ -30,4 +30,7 @@ public class MesWmBatchPageReqVO extends PageParam { | ||
| 30 | @Schema(description = "采购订单编号", example = "PO20250314001") | 30 | @Schema(description = "采购订单编号", example = "PO20250314001") |
| 31 | private String purchaseOrderCode; | 31 | private String purchaseOrderCode; |
| 32 | 32 | ||
| 33 | -} | 33 | + @Schema(description = "生产工单编号", example = "1") |
| 34 | + private Long workOrderId; | ||
| 35 | + | ||
| 36 | +} | ||
| 34 | \ No newline at end of file | 37 | \ No newline at end of file |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java
| @@ -32,6 +32,7 @@ public interface MesWmBatchMapper extends BaseMapperX<MesWmBatchDO> { | @@ -32,6 +32,7 @@ public interface MesWmBatchMapper extends BaseMapperX<MesWmBatchDO> { | ||
| 32 | .eqIfPresent(MesWmBatchDO::getClientId, reqVO.getClientId()) | 32 | .eqIfPresent(MesWmBatchDO::getClientId, reqVO.getClientId()) |
| 33 | .likeIfPresent(MesWmBatchDO::getSalesOrderCode, reqVO.getSalesOrderCode()) | 33 | .likeIfPresent(MesWmBatchDO::getSalesOrderCode, reqVO.getSalesOrderCode()) |
| 34 | .likeIfPresent(MesWmBatchDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) | 34 | .likeIfPresent(MesWmBatchDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) |
| 35 | + .eqIfPresent(MesWmBatchDO::getWorkOrderId, reqVO.getWorkOrderId()) | ||
| 35 | .orderByDesc(MesWmBatchDO::getId)); | 36 | .orderByDesc(MesWmBatchDO::getId)); |
| 36 | } | 37 | } |
| 37 | 38 |