From 1878a7dab3d83c6133063d10cf51256dd835c1a0 Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 28 Aug 2025 22:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDrawingreviewReceiptsController.java | 23 ++++++ .../controller/DesDesignChangeController.java | 2 +- .../domain/BusDrawingreviewReceipts.java | 4 ++ .../domain/bo/BusDrawingreviewReceiptsBo.java | 1 + .../domain/vo/BusDrawingreviewReceiptsVo.java | 21 ++++++ .../vo/designchange/DesDesignChangeVo.java | 5 ++ .../domain/vo/volumefile/DesVolumeFileVo.java | 5 ++ .../IBusDrawingreviewReceiptsService.java | 18 +++++ .../service/IDesVolumeCatalogService.java | 2 +- .../BusDrawingreviewReceiptsServiceImpl.java | 71 ++++++++++++++++++- .../impl/DesDesignChangeServiceImpl.java | 19 +++-- .../service/impl/DesUserServiceImpl.java | 2 +- .../impl/DesVolumeCatalogServiceImpl.java | 4 +- .../impl/DesVolumeFileServiceImpl.java | 15 +++- .../MatMaterialIssueController.java | 16 +++++ .../domain/MatMaterialIssueItem.java | 6 ++ .../MatMaterialIssueItemDto.java | 5 ++ .../MatMaterialIssueItemVo.java | 4 ++ .../service/IMatMaterialIssueService.java | 8 +++ .../impl/MatMaterialIssueServiceImpl.java | 16 +++++ .../impl/TenderSupplierInputServiceImpl.java | 1 + 21 files changed, 234 insertions(+), 14 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewReceiptsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewReceiptsController.java index 021f6cd9..9e53b4e6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewReceiptsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/BusDrawingreviewReceiptsController.java @@ -7,6 +7,9 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.design.domain.bo.DesUserBo; +import org.dromara.design.domain.vo.DesUserVo; +import org.dromara.design.service.IDesUserService; import org.dromara.project.domain.vo.project.BusSubProjectVo; import org.dromara.project.service.IBusProjectService; import org.springframework.web.bind.annotation.*; @@ -39,6 +42,7 @@ public class BusDrawingreviewReceiptsController extends BaseController { private final IBusDrawingreviewReceiptsService busDrawingreviewReceiptsService; + private final IDesUserService desUserService; /** * 查询设计-图纸评审验证列表 @@ -108,5 +112,24 @@ public class BusDrawingreviewReceiptsController extends BaseController { } + /** + * 获取设计-图纸评审验证详细信息 + * + * @param drawingreviewId 主键 + */ + @GetMapping("/review/{drawingreviewId}") + public R getInfoByReviewId(@NotNull(message = "关联id不能为空") + @PathVariable Long drawingreviewId) { + return R.ok(busDrawingreviewReceiptsService.getInfoByReviewId(drawingreviewId)); + } + + /** + * 获取设计人列表 + * + */ + @GetMapping("/desUser/list") + public R> list(DesUserBo bo) { + return R.ok(desUserService.queryList(bo)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesDesignChangeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesDesignChangeController.java index bf360162..e3446581 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesDesignChangeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesDesignChangeController.java @@ -129,7 +129,7 @@ public class DesDesignChangeController extends BaseController { */ @SaCheckPermission("design:designChange:add") @GetMapping("/catalogList/{projectId}") - public R> catalogList(@PathVariable("projectId") Long projectId) { + public R> catalogList(@PathVariable("projectId") Long projectId) { return R.ok(desVolumeCatalogService.catalogList(projectId)); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreviewReceipts.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreviewReceipts.java index bdc45ae6..64392696 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreviewReceipts.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/BusDrawingreviewReceipts.java @@ -164,4 +164,8 @@ public class BusDrawingreviewReceipts extends BaseEntity { private String approve; + /** + * 审定日期 + */ + private LocalDate approveDate; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewReceiptsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewReceiptsBo.java index c073c89d..b64b57d5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewReceiptsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusDrawingreviewReceiptsBo.java @@ -155,4 +155,5 @@ public class BusDrawingreviewReceiptsBo extends BaseEntity { private String approve; + private LocalDate approveDate; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewReceiptsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewReceiptsVo.java index dccfe9c0..1014db13 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewReceiptsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusDrawingreviewReceiptsVo.java @@ -3,6 +3,8 @@ package org.dromara.design.domain.vo; import java.time.LocalDate; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.design.domain.BusDrawingreviewReceipts; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -85,6 +87,9 @@ public class BusDrawingreviewReceiptsVo implements Serializable { @ExcelProperty(value = "专业") private String professional; + @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "professional",other = "des_user_major") + private String professionalName; + /** * 卷册 */ @@ -97,6 +102,9 @@ public class BusDrawingreviewReceiptsVo implements Serializable { @ExcelProperty(value = "设计人") private String designer; + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "designer") + private String designerName; + /** * 验证内容 */ @@ -181,5 +189,18 @@ public class BusDrawingreviewReceiptsVo implements Serializable { @ExcelProperty(value = "最终审核状态") private String finalState; + /** + * 审定人员Id + */ + private Long approveId; + /** + * 审定人员 + */ + private String approve; + + /** + * 审定日期 + */ + private LocalDate approveDate; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/designchange/DesDesignChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/designchange/DesDesignChangeVo.java index 5ecb7ef4..83edf5a0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/designchange/DesDesignChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/designchange/DesDesignChangeVo.java @@ -158,4 +158,9 @@ public class DesDesignChangeVo implements Serializable { */ private String auditStatus; + /** + * 是否弹窗 + */ + private Boolean isWindow =true; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumefile/DesVolumeFileVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumefile/DesVolumeFileVo.java index 80b8faf8..e1873255 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumefile/DesVolumeFileVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumefile/DesVolumeFileVo.java @@ -76,4 +76,9 @@ public class DesVolumeFileVo implements Serializable { */ private String auditStatus; + /** + * 是否弹窗 + */ + private Boolean isWindow =true; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewReceiptsService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewReceiptsService.java index d23bcb54..431c6d96 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewReceiptsService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IBusDrawingreviewReceiptsService.java @@ -1,5 +1,9 @@ package org.dromara.design.service; +import jakarta.validation.constraints.NotNull; +import org.dromara.design.domain.DesDesignChange; +import org.dromara.design.domain.DesVolumeCatalog; +import org.dromara.design.domain.DesVolumeFile; import org.dromara.design.domain.vo.BusDrawingreviewReceiptsVo; import org.dromara.design.domain.bo.BusDrawingreviewReceiptsBo; import org.dromara.design.domain.BusDrawingreviewReceipts; @@ -7,6 +11,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.bind.annotation.PathVariable; + import java.util.Collection; import java.util.List; @@ -67,4 +73,16 @@ public interface IBusDrawingreviewReceiptsService extends IService ids, Boolean isValid); + + /** + * 根据ReviewId查询 + */ + BusDrawingreviewReceiptsVo getInfoByReviewId(Long drawingreviewId); + + + void createReceipts(DesVolumeCatalog volumeCatalog,List desVolumeFiles); + + void createReceipts(DesDesignChange designChange); + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesVolumeCatalogService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesVolumeCatalogService.java index 38f52645..84c40988 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesVolumeCatalogService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/IDesVolumeCatalogService.java @@ -118,6 +118,6 @@ public interface IDesVolumeCatalogService extends IService { * 获取变更单所选择的卷册目录列表 * */ - List catalogList(Long projectId); + List catalogList(Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java index 27410eb9..c1db611d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusDrawingreviewReceiptsServiceImpl.java @@ -9,6 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.design.domain.DesDesignChange; +import org.dromara.design.domain.DesVolumeCatalog; +import org.dromara.design.domain.DesVolumeFile; +import org.dromara.design.service.IDesVolumeCatalogService; +import org.dromara.project.service.IBusProjectService; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.dromara.design.domain.bo.BusDrawingreviewReceiptsBo; import org.dromara.design.domain.vo.BusDrawingreviewReceiptsVo; @@ -16,9 +22,7 @@ import org.dromara.design.domain.BusDrawingreviewReceipts; import org.dromara.design.mapper.BusDrawingreviewReceiptsMapper; import org.dromara.design.service.IBusDrawingreviewReceiptsService; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 设计-图纸评审验证Service业务层处理 @@ -32,6 +36,10 @@ public class BusDrawingreviewReceiptsServiceImpl extends ServiceImpl 0; } + + @Override + public BusDrawingreviewReceiptsVo getInfoByReviewId(Long drawingreviewId) { + return baseMapper.selectVoOne(Wrappers.lambdaQuery() + .eq(BusDrawingreviewReceipts::getDrawingreviewId, drawingreviewId) + .orderByDesc(BusDrawingreviewReceipts::getCreateTime) + .last("limit 1") + ); + } + + @Async + @Override + public void createReceipts(DesVolumeCatalog volumeCatalog, List desVolumeFiles) { + + String projectName = projectService.getById(volumeCatalog.getProjectId()).getProjectName(); + + ArrayList list = new ArrayList<>(); + + for (DesVolumeFile desVolumeFile : desVolumeFiles) { + + BusDrawingreviewReceipts busDrawingreviewReceipts = new BusDrawingreviewReceipts(); + busDrawingreviewReceipts.setDrawingreviewId(desVolumeFile.getId()); + busDrawingreviewReceipts.setProjectId(volumeCatalog.getProjectId()); + busDrawingreviewReceipts.setProjectName(projectName); + + busDrawingreviewReceipts.setDesigner(volumeCatalog.getPrincipal()); + String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 16); + busDrawingreviewReceipts.setNum("PS-" + uuid); + busDrawingreviewReceipts.setProfessional(volumeCatalog.getSpecialty()); + busDrawingreviewReceipts.setVolume(volumeCatalog.getDocumentName()); + + list.add(busDrawingreviewReceipts); + } + baseMapper.insertBatch(list); + } + + @Async + @Override + public void createReceipts(DesDesignChange designChange) { + DesVolumeCatalog volumeCatalog = desVolumeCatalogService.getOne(Wrappers.lambdaQuery() + .eq(DesVolumeCatalog::getVolumeNumber, designChange.getVolumeNo()) + .eq(DesVolumeCatalog::getProjectId, designChange.getProjectId()) + .last("limit 1") + ); + + BusDrawingreviewReceipts busDrawingreviewReceipts = new BusDrawingreviewReceipts(); + busDrawingreviewReceipts.setDrawingreviewId(designChange.getId()); + busDrawingreviewReceipts.setProjectId(designChange.getProjectId()); + busDrawingreviewReceipts.setProjectName(designChange.getProjectName()); + + busDrawingreviewReceipts.setDesigner(volumeCatalog.getPrincipal()); + String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 16); + busDrawingreviewReceipts.setNum("PS-" + uuid); + busDrawingreviewReceipts.setProfessional(volumeCatalog.getSpecialty()); + busDrawingreviewReceipts.setVolume(volumeCatalog.getDocumentName()); + save(busDrawingreviewReceipts); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java index dd4c2c75..181eb994 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java @@ -40,13 +40,11 @@ import org.dromara.design.domain.dto.designchange.DesDesignChangeCreateReq; import org.dromara.design.domain.dto.designchange.DesDesignChangeQueryReq; import org.dromara.design.domain.dto.designchange.DesDesignChangeUpdateReq; import org.dromara.design.domain.dto.designchange.DesDesignExtendDetailDto; +import org.dromara.design.domain.vo.BusDrawingreviewReceiptsVo; import org.dromara.design.domain.vo.designchange.DesDesignChangeVo; import org.dromara.design.domain.vo.volumefile.DesVolumeFileVo; import org.dromara.design.mapper.DesDesignChangeMapper; -import org.dromara.design.service.IDesDesignChangeService; -import org.dromara.design.service.IDesDrawingService; -import org.dromara.design.service.IDesVolumeCatalogService; -import org.dromara.design.service.IDesVolumeFileService; +import org.dromara.design.service.*; import org.dromara.facility.domain.FacMatrix; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.vo.SysOssVo; @@ -96,6 +94,9 @@ public class DesDesignChangeServiceImpl extends ServiceImpl impl baseMapper.delete(Wrappers.lambdaQuery().eq(DesUser::getProjectId, dto.getProjectId())); List desUsers = MapstructUtils.convert(dto.getList(), DesUser.class); //todo:发消息 - return baseMapper.insertBatch(desUsers); + return saveBatch(desUsers); } @Override diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java index d4cb20e2..2df3b5bd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java @@ -332,7 +332,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl catalogList(Long projectId) { + public List catalogList(Long projectId) { //查询已有审核通过蓝图的卷册目录 List list = volumeFileService.list(Wrappers.lambdaQuery(DesVolumeFile.class) @@ -346,7 +346,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl list1 = list.stream().map(DesVolumeFile::getVolumeCatalogId).distinct().toList(); - return baseMapper.selectList(Wrappers.lambdaQuery(DesVolumeCatalog.class) + return baseMapper.selectVoList(Wrappers.lambdaQuery(DesVolumeCatalog.class) .eq(DesVolumeCatalog::getProjectId, projectId) .in(DesVolumeCatalog::getDesign, list1) .orderByDesc(DesVolumeCatalog::getCreateTime) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java index cf63792f..5bc2dcda 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java @@ -22,10 +22,12 @@ import org.dromara.design.domain.DesVolumeCatalog; import org.dromara.design.domain.DesVolumeFile; import org.dromara.design.domain.bo.DesVolumeFileBo; import org.dromara.design.domain.dto.volumefile.DesVolumeFileCreateReq; +import org.dromara.design.domain.vo.BusDrawingreviewReceiptsVo; import org.dromara.design.domain.vo.volumefile.DesVolumeFileCodeVo; import org.dromara.design.domain.vo.volumefile.DesVolumeFileJoinVo; import org.dromara.design.domain.vo.volumefile.DesVolumeFileVo; import org.dromara.design.mapper.DesVolumeFileMapper; +import org.dromara.design.service.IBusDrawingreviewReceiptsService; import org.dromara.design.service.IDesDrawingService; import org.dromara.design.service.IDesVolumeCatalogService; import org.dromara.design.service.IDesVolumeFileService; @@ -67,6 +69,10 @@ public class DesVolumeFileServiceImpl extends ServiceImpl> inventoryList(@NotEmpty(message = "项目不能为空") + @PathVariable Long projectId) { + return R.ok(matMaterialIssueService.inventoryList(projectId)); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialIssueItem.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialIssueItem.java index cf3faaad..b25fd8cc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialIssueItem.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/MatMaterialIssueItem.java @@ -74,4 +74,10 @@ public class MatMaterialIssueItem extends BaseEntity { */ private String remark; + + /** + * 出入库id + */ + private Long inventoryId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialissueitem/MatMaterialIssueItemDto.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialissueitem/MatMaterialIssueItemDto.java index 891719f8..20633023 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialissueitem/MatMaterialIssueItemDto.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/dto/materialissueitem/MatMaterialIssueItemDto.java @@ -69,4 +69,9 @@ public class MatMaterialIssueItemDto { */ private String remark; + /** + * 出入库id + */ + private Long inventoryId; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialissueitem/MatMaterialIssueItemVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialissueitem/MatMaterialIssueItemVo.java index bbc33664..35274c99 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialissueitem/MatMaterialIssueItemVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/vo/materialissueitem/MatMaterialIssueItemVo.java @@ -72,4 +72,8 @@ public class MatMaterialIssueItemVo implements Serializable { */ private String remark; + /** + * 出入库id + */ + private Long inventoryId; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialIssueService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialIssueService.java index ab420cb9..33f4370b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialIssueService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IMatMaterialIssueService.java @@ -7,10 +7,12 @@ import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.materials.domain.MatMaterialIssue; +import org.dromara.materials.domain.MatMaterialsInventory; import org.dromara.materials.domain.dto.materialissue.MatMaterialIssueCreateReq; import org.dromara.materials.domain.dto.materialissue.MatMaterialIssueQueryReq; import org.dromara.materials.domain.dto.materialissue.MatMaterialIssueUpdateReq; import org.dromara.materials.domain.vo.materialissue.MatMaterialIssueVo; +import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo; import java.util.Collection; import java.util.List; @@ -103,4 +105,10 @@ public interface IMatMaterialIssueService extends IService { * @return 物料领料单分页对象视图 */ Page getVoPage(Page materialIssuePage); + + + /** + * 查询出库记录列表 + */ + List inventoryList(Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java index fd6c05b3..a22034df 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java @@ -1,7 +1,9 @@ package org.dromara.materials.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.deepoove.poi.XWPFTemplate; @@ -34,6 +36,7 @@ import org.dromara.materials.domain.dto.materialissueitem.MatMaterialIssueItemDt import org.dromara.materials.domain.dto.materialissueitem.MatMaterialIssueItemWordDto; import org.dromara.materials.domain.enums.MatMaterialsInventoryOutPutEnum; import org.dromara.materials.domain.vo.materialissue.MatMaterialIssueVo; +import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo; import org.dromara.materials.mapper.MatMaterialIssueMapper; import org.dromara.materials.service.IMatMaterialIssueItemService; import org.dromara.materials.service.IMatMaterialIssueService; @@ -470,6 +473,19 @@ public class MatMaterialIssueServiceImpl extends ServiceImpl inventoryList(Long projectId) { + + List list = materialIssueItemService.list(Wrappers.lambdaQuery(MatMaterialIssueItem.class) + .eq(MatMaterialIssueItem::getProjectId, 1)); + List list1 = list.stream().map(MatMaterialIssueItem::getInventoryId).toList(); + return materialsInventoryService.list(Wrappers.lambdaQuery(MatMaterialsInventory.class) + .notIn(CollectionUtil.isNotEmpty(list1),MatMaterialsInventory::getId, list1) + .eq(MatMaterialsInventory::getProjectId, projectId) + .eq(MatMaterialsInventory::getOutPut, "1") + ); + } + /** * 获取文件数量 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java index c5f3712c..50dcdf25 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java @@ -94,6 +94,7 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl