Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩

gaoluyang

5 天以前 6b8585fc452ecdcaa82d86fab79a9f27bb442851

 yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/MdmItemController.java

@@ -114,9 +114,16 @@
        return success(technicalFileService.createTechnicalFile(reqVO));
    }

    @DeleteMapping("/technical-file/delete")
    @Operation(summary = "从物料移除技术文件")
    @PreAuthorize("@ss.hasPermission('mdm:item:update')")
    public CommonResult<Boolean> deleteTechnicalFile(@RequestParam("itemId") Long itemId, @RequestParam("id") Long id) {
        technicalFileService.deleteTechnicalFile(itemId, id);
        return success(true);
    }

    @GetMapping("/technical-file/list")
    @Operation(summary = "获得产品技术文件历史")
    @PreAuthorize("@ss.hasPermission('mdm:item:query')")
    public CommonResult<List<MdmItemTechnicalFileRespVO>> getTechnicalFileList(@RequestParam("itemId") Long itemId) {
        return success(technicalFileService.getTechnicalFileList(itemId));
    }
@@ -142,7 +149,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得物料")
    @Parameter(name = "id", description = "编号", required = true, example = "1")
    @PreAuthorize("@ss.hasPermission('mdm:item:query')")
    public CommonResult<MdmItemRespVO> getItem(@RequestParam("id") Long id) {
        MdmItemDO item = itemService.getItem(id);
        MdmItemRespVO resp = BeanUtils.toBean(item, MdmItemRespVO.class);
@@ -158,7 +164,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得物料分页")
    @PreAuthorize("@ss.hasPermission('mdm:item:query')")
    public CommonResult<PageResult<MdmItemRespVO>> getItemPage(@Valid MdmItemPageReqVO pageReqVO) {
        PageResult<MdmItemDO> pageResult = itemService.getItemPage(pageReqVO);
        // 转换并补齐关联名称
@@ -254,7 +259,6 @@
    @GetMapping("/list-by-ids")
    @Operation(summary = "获得物料列表")
    @Parameter(name = "ids", description = "编号列表", required = true, example = "1,2,3")
    @PreAuthorize("@ss.hasPermission('mdm:item:query')")
    public CommonResult<List<MdmItemRespVO>> getItemList(@RequestParam("ids") List<Long> ids) {
        List<MdmItemDO> list = itemService.getItemList(ids);
        return success(BeanUtils.toBean(list, MdmItemRespVO.class));