From 51d64e0802cc56ce949b5e88cb5bafc8076a4e16 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 6 Apr 2026 16:59:07 +0800 Subject: [PATCH] ✨ feat(batch): 添加生产工单编号字段并重构选择器组件 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java | 7 ------- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchPageReqVO.java | 5 ++++- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java index d8d4899..500d7e8 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java @@ -96,13 +96,6 @@ public class MesWmBatchController { return success(buildBatchRespVOList(list)); } - @GetMapping("/simple-list") - @Operation(summary = "获得批次精简列表", description = "主要用于前端下拉") - public CommonResult> getBatchSimpleList() { - List list = batchService.getBatchList(); - return success(BeanUtils.toBean(list, MesWmBatchRespVO.class)); - } - // ==================== 拼接 VO ==================== private List buildBatchRespVOList(List list) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchPageReqVO.java index 4906d6d..c527bd2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchPageReqVO.java +++ b/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 { @Schema(description = "采购订单编号", example = "PO20250314001") private String purchaseOrderCode; -} + @Schema(description = "生产工单编号", example = "1") + private Long workOrderId; + +} \ No newline at end of file diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java index 2c161f2..a3b42ed 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java +++ b/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 { .eqIfPresent(MesWmBatchDO::getClientId, reqVO.getClientId()) .likeIfPresent(MesWmBatchDO::getSalesOrderCode, reqVO.getSalesOrderCode()) .likeIfPresent(MesWmBatchDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode()) + .eqIfPresent(MesWmBatchDO::getWorkOrderId, reqVO.getWorkOrderId()) .orderByDesc(MesWmBatchDO::getId)); } -- libgit2 0.21.4