diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java index ea1afa8..7d7b678 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkorderController.java @@ -36,7 +36,6 @@ import java.util.*; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; @Tag(name = "管理后台 - MES 生产工单") @@ -104,18 +103,6 @@ public class MesProWorkOrderController { return success(new PageResult<>(buildWorkOrderRespVOList(pageResult.getList()), pageResult.getTotal())); } - @GetMapping("/simple-list") - @Operation(summary = "获得生产工单精简列表", description = "主要用于前端的下拉选项") - @Parameter(name = "type", description = "工单类型", example = "2") - public CommonResult> getWorkOrderSimpleList( - @RequestParam(value = "type", required = false) Integer type) { - List list = workOrderService.getWorkOrderList(type); - return success(convertList(list, wo -> new MesProWorkOrderRespVO() - .setId(wo.getId()).setCode(wo.getCode()).setName(wo.getName()) - .setType(wo.getType()).setVendorId(wo.getVendorId()) - .setStatus(wo.getStatus()))); - } - @GetMapping("/export-excel") @Operation(summary = "导出生产工单 Excel") @PreAuthorize("@ss.hasPermission('mes:pro-work-order:export')") diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java index 4244d63..9aa713e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java @@ -122,14 +122,6 @@ public interface MesProWorkOrderService { void cancelWorkOrder(Long id); /** - * 获得工单列表 - * - * @param type 工单类型(可选,为 null 时查询全部) - * @return 工单列表 - */ - List getWorkOrderList(Integer type); - - /** * 累加工单的已生产数量 * * @param id 工单编号 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java index 72a195f..431b084 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java @@ -6,7 +6,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemBatchConfigDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper; @@ -239,13 +238,6 @@ public class MesProWorkOrderServiceImpl implements MesProWorkOrderService { } @Override - public List getWorkOrderList(Integer type) { - return workOrderMapper.selectList(new LambdaQueryWrapperX() - .eqIfPresent(MesProWorkOrderDO::getType, type) - .orderByDesc(MesProWorkOrderDO::getId)); - } - - @Override public void updateProducedQuantity(Long id, BigDecimal incrQuantityProduced) { // 校验工单存在 validateWorkOrderExists(id);