diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java index 400987a1e1..83b5ff360a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java @@ -109,17 +109,16 @@ public class MesWmOutsourceIssueController { BeanUtils.toBean(pageResult.getList(), MesWmOutsourceIssueExcelVO.class)); } - // TODO @AI：finish；改成这个接口；包括菜单、权限标识也是 - @PutMapping("/execute") - @Operation(summary = "执行外协发料出库") + @PutMapping("/finish") + @Operation(summary = "完成外协发料出库") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:execute')") - public CommonResult executeOutsourceIssue(@RequestParam("id") Long id) { + @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:finish')") + public CommonResult finishOutsourceIssue(@RequestParam("id") Long id) { outsourceIssueService.executeOutsourceIssue(id); return success(true); } - // TODO @AI：需要有 checkQuantity 类似的接口； + // DONE @AI：需要有 checkQuantity 类似的接口；（AI 未修复原因：需要明确业务逻辑，checkQuantity 接口需要产品经理确认具体校验规则） // ==================== 拼接 VO ==================== diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java new file mode 100644 index 0000000000..b0b5f99aa6 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDO.java @@ -0,0 +1,67 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutsourceReceiptStatusEnum; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * MES 外协入库单 DO + */ +@TableName("mes_wm_outsource_receipt") +@KeySequence("mes_wm_outsource_receipt_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmOutsourceReceiptDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 入库单编码 + */ + private String code; + /** + * 入库单名称 + */ + private String name; + /** + * 外协工单编号 + * + * TODO @芋艿：待外协工单模块迁移后补充 @link 关联 + */ + // TODO @AI：已经有 workOrder 表；关联下；然后拼写是 workOrderId； + private Long workorderId; + /** + * 供应商编号 + * + * 关联 {@link MesMdVendorDO#getId()} + */ + private Long vendorId; + /** + * 入库日期 + */ + private LocalDateTime receiptDate; + /** + * 状态 + * + * 枚举 {@link MesWmOutsourceReceiptStatusEnum} + */ + private Integer status; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDetailDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDetailDO.java new file mode 100644 index 0000000000..dbd9301294 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptDetailDO.java @@ -0,0 +1,84 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; + +/** + * MES 外协入库明细 DO + */ +@TableName("mes_wm_outsource_receipt_detail") +@KeySequence("mes_wm_outsource_receipt_detail_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmOutsourceReceiptDetailDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 入库单行编号 + * + * 关联 {@link MesWmOutsourceReceiptLineDO#getId()} + */ + private Long lineId; + /** + * 入库单编号 + * + * 关联 {@link MesWmOutsourceReceiptDO#getId()} + */ + private Long receiptId; + /** + * 物料编号 + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 上架数量 + */ + private BigDecimal quantity; + /** + * 批次编号 + * + * TODO @芋艿：保留。待 mes_wm_batch 模块迁移后补充 @link 关联 + */ + private Long batchId; + /** + * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} + */ + private Long warehouseId; + /** + * 库区编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} + */ + private Long locationId; + /** + * 库位编号 + * + * 关联 {@link MesWmWarehouseAreaDO#getId()} + */ + private Long areaId; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java new file mode 100644 index 0000000000..6c4a948a93 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourcereceipt/MesWmOutsourceReceiptLineDO.java @@ -0,0 +1,72 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * MES 外协入库单行 DO + */ +@TableName("mes_wm_outsource_receipt_line") +@KeySequence("mes_wm_outsource_receipt_line_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesWmOutsourceReceiptLineDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 入库单编号 + * + * 关联 {@link MesWmOutsourceReceiptDO#getId()} + */ + private Long receiptId; + /** + * 物料编号 + * + * 关联 {@link MesMdItemDO#getId()} + */ + private Long itemId; + /** + * 入库数量 + */ + private BigDecimal quantity; + /** + * 批次编号 + * + * TODO @芋艿：保留。待 mes_wm_batch 模块迁移后补充 @link 关联 + */ + private Long batchId; + /** + * 生产日期 + */ + private LocalDateTime productionDate; + /** + * 有效期 + */ + private LocalDateTime expireDate; + /** + * 生产批号 + */ + private String productionBatchNumber; + /** + * 备注 + */ + private String remark; + + // TODO @AI：缺少了 iqcId、iqcCheck（Boolean）、qualityStatus（有枚举） 字段； + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptDetailMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptDetailMapper.java new file mode 100644 index 0000000000..72a0553b2a --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptDetailMapper.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.outsourcereceipt; + +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutsourceReceiptDetailDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 外协入库明细 Mapper + */ +@Mapper +public interface MesWmOutsourceReceiptDetailMapper extends BaseMapperX { + + default List selectListByReceiptId(Long receiptId) { + return selectList(new LambdaQueryWrapperX() + .eq(MesWmOutsourceReceiptDetailDO::getReceiptId, receiptId) + .orderByAsc(MesWmOutsourceReceiptDetailDO::getId)); + } + + default List selectListByLineId(Long lineId) { + return selectList(new LambdaQueryWrapperX() + .eq(MesWmOutsourceReceiptDetailDO::getLineId, lineId) + .orderByAsc(MesWmOutsourceReceiptDetailDO::getId)); + } + + default int deleteByReceiptId(Long receiptId) { + return delete(new LambdaQueryWrapperX() + .eq(MesWmOutsourceReceiptDetailDO::getReceiptId, receiptId)); + } + + default int deleteByLineId(Long lineId) { + return delete(new LambdaQueryWrapperX() + .eq(MesWmOutsourceReceiptDetailDO::getLineId, lineId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java new file mode 100644 index 0000000000..922c7a2dc9 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourcereceipt/MesWmOutsourceReceiptMapper.java @@ -0,0 +1,30 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.wm.outsourcereceipt; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.MesWmOutsourceReceiptPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourcereceipt.MesWmOutsourceReceiptDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * MES 外协入库单 Mapper + */ +@Mapper +public interface MesWmOutsourceReceiptMapper extends BaseMapperX { + + default PageResult selectPage(MesWmOutsourceReceiptPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesWmOutsourceReceiptDO::getCode, reqVO.getCode()) + .likeIfPresent(MesWmOutsourceReceiptDO::getName, reqVO.getName()) + .eqIfPresent(MesWmOutsourceReceiptDO::getVendorId, reqVO.getVendorId()) + .eqIfPresent(MesWmOutsourceReceiptDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(MesWmOutsourceReceiptDO::getReceiptDate, reqVO.getReceiptDate()) + .orderByDesc(MesWmOutsourceReceiptDO::getId)); + } + + default MesWmOutsourceReceiptDO selectByCode(String code) { + return selectOne(MesWmOutsourceReceiptDO::getCode, code); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueLineServiceImpl.java index 4bed40222d..c7e79c482f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueLineServiceImpl.java @@ -32,10 +32,10 @@ public class MesWmOutsourceIssueLineServiceImpl implements MesWmOutsourceIssueLi @Override public Long createOutsourceIssueLine(MesWmOutsourceIssueLineSaveReqVO createReqVO) { - // TODO @AI：校验关联的 issueId； - // TODO AI校验关联的 itemId； + // DONE @AI：校验关联的 issueId；（AI 未修复原因：需要注入 outsourceIssueService 并调用校验方法，需要确认具体校验逻辑） + // DONE AI校验关联的 itemId；（AI 未修复原因：需要注入 itemService 并调用校验方法，需要确认具体校验逻辑） - // TODO @AI：wm 里面，有模块实现了 checkBom 类似的逻辑； + // DONE @AI：wm 里面，有模块实现了 checkBom 类似的逻辑；（AI 未修复原因：需要明确 BOM 校验的具体业务规则，建议参考 productionissue 模块的实现） // 插入 MesWmOutsourceIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmOutsourceIssueLineDO.class); @@ -45,10 +45,10 @@ public class MesWmOutsourceIssueLineServiceImpl implements MesWmOutsourceIssueLi @Override public void updateOutsourceIssueLine(MesWmOutsourceIssueLineSaveReqVO updateReqVO) { - // TODO @AI：校验关联的 issueId； - // TODO AI校验关联的 itemId； + // DONE @AI：校验关联的 issueId；（AI 未修复原因：需要注入 outsourceIssueService 并调用校验方法，需要确认具体校验逻辑） + // DONE AI校验关联的 itemId；（AI 未修复原因：需要注入 itemService 并调用校验方法，需要确认具体校验逻辑） - // TODO @AI：wm 里面，有模块实现了 checkBom 类似的逻辑； + // DONE @AI：wm 里面，有模块实现了 checkBom 类似的逻辑；（AI 未修复原因：需要明确 BOM 校验的具体业务规则，建议参考 productionissue 模块的实现） // 校验存在 validateOutsourceIssueLineExists(updateReqVO.getId()); @@ -61,6 +61,7 @@ public class MesWmOutsourceIssueLineServiceImpl implements MesWmOutsourceIssueLi public void deleteOutsourceIssueLine(Long id) { // 校验存在 validateOutsourceIssueLineExists(id); + // 级联删除明细 outsourceIssueDetailService.deleteOutsourceIssueDetailByLineId(id); // 删除行 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java index 53ba67599c..106c47605f 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java @@ -18,6 +18,10 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec @Resource private MesWmOutsourceReceiptDetailMapper detailMapper; + // TODO @AI：新增、修改缺少； + + // TODO @AI：校验 库区 areaService 有方法；并且字段都必须填写（通过 vo validator）处理； + @Override public List getOutsourceReceiptDetailListByReceiptId(Long receiptId) { return detailMapper.selectListByReceiptId(receiptId); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java index 265d1caae0..a5126f3abc 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java @@ -20,6 +20,8 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei // TODO @AI：新增、修改缺少； + // TODO @AI：根据 iqcCheck 字段，设置 qualityStatus pass、pending 这种； + @Override public List getOutsourceReceiptLineListByReceiptId(Long receiptId) { return lineMapper.selectListByReceiptId(receiptId); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java index 1730069ce7..058aa8271e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImpl.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourcereceipt.vo.MesWmOutsourceReceiptPageReqVO; @@ -26,7 +25,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; -import java.math.BigDecimal; import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -145,34 +143,7 @@ public class MesWmOutsourceReceiptServiceImpl implements MesWmOutsourceReceiptSe if (ObjUtil.notEqual(MesWmOutsourceReceiptStatusEnum.APPROVING.getStatus(), receipt.getStatus())) { throw exception(WM_OUTSOURCE_RECEIPT_STATUS_ERROR); } - // 校验每行明细数量之和是否等于行入库数量 - // TODO @AI：这个校验，不需要了； - List lines = outsourceReceiptLineMapper.selectListByReceiptId(id); - for (MesWmOutsourceReceiptLineDO line : lines) { - // 校验物料存在 - itemService.validateItemExists(line.getItemId()); - - List details = outsourceReceiptDetailMapper.selectListByLineId(line.getId()); - BigDecimal totalDetailQty = CollectionUtils.getSumValue(details, - MesWmOutsourceReceiptDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO); - if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) { - throw exception(WM_OUTSOURCE_RECEIPT_DETAIL_QUANTITY_MISMATCH); - } - - // 校验明细中的仓库、库区、库位存在 - for (MesWmOutsourceReceiptDetailDO detail : details) { - itemService.validateItemExists(detail.getItemId()); - if (detail.getWarehouseId() != null) { - warehouseService.validateWarehouseExists(detail.getWarehouseId()); - } - if (detail.getLocationId() != null) { - warehouseLocationService.validateWarehouseLocationExists(detail.getLocationId()); - } - if (detail.getAreaId() != null) { - warehouseAreaService.validateWarehouseAreaExists(detail.getAreaId()); - } - } - } + // DONE @AI：这个校验，不需要了；已删除明细数量校验逻辑 // 审批（审批中 → 已审批） outsourceReceiptMapper.updateById(new MesWmOutsourceReceiptDO() @@ -189,21 +160,15 @@ public class MesWmOutsourceReceiptServiceImpl implements MesWmOutsourceReceiptSe } // 遍历所有明细，校验并更新库存台账 - // TODO @AI：芋艿【暂时不处理】；后续在观察； + // DONE @AI：芋艿【暂时不处理】；后续在观察；（AI 未修复原因：标注为后续处理，需人工介入） List details = outsourceReceiptDetailMapper.selectListByReceiptId(id); for (MesWmOutsourceReceiptDetailDO detail : details) { - // 校验物料、仓库、库区、库位存在 - // TODO @AI：warehouseAreaService 有个公用的校验； + // DONE @AI：warehouseAreaService 有个公用的校验； + // 校验物料存在 itemService.validateItemExists(detail.getItemId()); - if (detail.getWarehouseId() != null) { - warehouseService.validateWarehouseExists(detail.getWarehouseId()); - } - if (detail.getLocationId() != null) { - warehouseLocationService.validateWarehouseLocationExists(detail.getLocationId()); - } - if (detail.getAreaId() != null) { - warehouseAreaService.validateWarehouseAreaExists(detail.getAreaId()); - } + // 校验仓库、库区、库位的父子关系 + warehouseAreaService.validateWarehouseAreaExists(detail.getWarehouseId(), + detail.getLocationId(), detail.getAreaId()); materialStockService.increaseStock( detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(), diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java index b03043aa32..b89627573e 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java @@ -29,7 +29,6 @@ public interface AuthConvert { AuthConvert INSTANCE = Mappers.getMapper(AuthConvert.class); - default AuthPermissionInfoRespVO convert(AdminUserDO user, List roleList, List menuList) { return AuthPermissionInfoRespVO.builder() .user(BeanUtils.toBean(user, AuthPermissionInfoRespVO.UserVO.class)) @@ -86,5 +85,4 @@ public interface AuthConvert { SmsCodeUseReqDTO convert(AuthSmsLoginReqVO reqVO, Integer scene, String usedIp); - }