diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java index 7baa4ae5..e0ddd546 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java @@ -15,6 +15,7 @@ import org.dromara.cailiaoshebei.service.IBusMaterialbatchdemandplanService; import org.dromara.cailiaoshebei.service.IBusPlanDocAssociationService; import org.dromara.cailiaoshebei.service.IBusPurchaseDocService; import org.dromara.common.core.domain.R; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; @@ -24,6 +25,10 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; +import org.dromara.design.domain.BusBillofquantities; +import org.dromara.design.domain.BusBillofquantitiesVersions; +import org.dromara.design.service.IBusBillofquantitiesService; +import org.dromara.design.service.IBusBillofquantitiesVersionsService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,6 +53,9 @@ public class BusPurchaseDocController extends BaseController { private final IBusPlanDocAssociationService planDocAssociationService; + private final IBusBillofquantitiesVersionsService busBillofquantitiesVersionsService; + + private final IBusBillofquantitiesService busBillofquantitiesService; /** * 查询物资-采购联系单列表 */ @@ -155,4 +163,27 @@ public class BusPurchaseDocController extends BaseController { bo.setIds(list1); return R.ok(materialbatchdemandplanService.queryList(bo)); } + + + /** + * 获取工程量清单列表 + */ + @SaCheckPermission("cailiaoshebei:purchaseDoc:add") + @GetMapping("/engineeringList") + public R> obtainTheList(Long projectId) { + + + BusBillofquantitiesVersions one = busBillofquantitiesVersionsService.getOne(Wrappers.lambdaQuery() + .eq(BusBillofquantitiesVersions::getWorkOrderType, "4") + .eq(BusBillofquantitiesVersions::getProjectId, projectId) + .eq(BusBillofquantitiesVersions::getStatus, BusinessStatusEnum.FINISH.getStatus()) + .last("limit 1") + ); + + List list = busBillofquantitiesService.list(Wrappers.lambdaQuery() + .eq(BusBillofquantities::getVersions, one.getVersions()) + ); + + return R.ok(list); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java index bd56c4a7..a207a848 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/dto/volumecatalog/DesVolumeCatalogUpdateReq.java @@ -63,4 +63,9 @@ public class DesVolumeCatalogUpdateReq implements Serializable { */ private String remark; + /** + * 备注 + */ + private String opinion; + }