diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java index 9eae946f..0f881f36 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java @@ -7,17 +7,21 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import cn.dev33.satoken.annotation.SaMode; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.cailiaoshebei.domain.bo.BusMaterialbatchdemandplanBo; import org.dromara.cailiaoshebei.domain.bo.BusMrpBaseReq; import org.dromara.cailiaoshebei.domain.bo.RemainingReq; import org.dromara.cailiaoshebei.domain.dto.BusMrpDto; import org.dromara.cailiaoshebei.domain.dto.BusMrpExportDto; +import org.dromara.cailiaoshebei.domain.vo.BusMaterialbatchdemandplanVo; import org.dromara.cailiaoshebei.domain.vo.BusMrpVo; +import org.dromara.cailiaoshebei.service.IBusMaterialbatchdemandplanService; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.design.domain.BusBillofquantities; @@ -67,6 +71,18 @@ public class BusMrpBaseController extends BaseController { private final IBusBillofquantitiesService busBillofquantitiesService; private final IBusBiddingPlanService busBiddingPlanService; + private final IBusMaterialbatchdemandplanService busMaterialbatchdemandplanService; + + + /** + * 查询物资-批次需求计划列表 + */ + @SaCheckPermission("cailiaoshebei:mrpBase:list") + @GetMapping("/getPlanList") + public TableDataInfo list(BusMaterialbatchdemandplanBo bo, PageQuery pageQuery) { + return busMaterialbatchdemandplanService.queryPageList(bo, pageQuery); + } + /** * 查询物资-批次需求计划基础信息列表 */ @@ -101,7 +117,7 @@ public class BusMrpBaseController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("cailiaoshebei:mrpBase:query") +// @SaCheckPermission("cailiaoshebei:mrpBase:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -146,7 +162,7 @@ public class BusMrpBaseController extends BaseController { /** * 批量新增或修改 */ - @SaCheckPermission("cailiaoshebei:mrpBase:addbatch") + @SaCheckPermission("cailiaoshebei:mrpBase:add") @RepeatSubmit() @PostMapping("/batch") public R batchAddOrUpdate(@RequestBody BusMrpDto dto) { @@ -156,6 +172,7 @@ public class BusMrpBaseController extends BaseController { /** * 获取剩余量 */ + @SaCheckPermission(value = {"cailiaoshebei:mrpBase:add","cailiaoshebei:mrpBase:edit"},mode = SaMode.OR) @GetMapping("/remaining") public R>> remaining( RemainingReq req) { String[] split = req.getLimitListId().split(","); @@ -171,7 +188,7 @@ public class BusMrpBaseController extends BaseController { /** * 导入物资需求批次计划 */ - @SaCheckPermission("cailiaoshebei:mrpBase:import") + @SaCheckPermission("cailiaoshebei:mrpBase:add") @Log(title = "物资-批次需求计划基础信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/import") @@ -200,7 +217,7 @@ public class BusMrpBaseController extends BaseController { /** * 获取工程量清单列表 */ - @SaCheckPermission("cailiaoshebei:mrpBase:getZhaoBiaoList") + @SaCheckPermission(value = {"cailiaoshebei:mrpBase:add","cailiaoshebei:mrpBase:edit"},mode = SaMode.OR) @GetMapping("/getZhaoBiaoList") public R> getZhaoBiaoList(CoryObtainTheListReq req) { BusBiddingPlanBo bo = new BusBiddingPlanBo(); @@ -216,7 +233,7 @@ public class BusMrpBaseController extends BaseController { * @param bo * @return */ - @SaCheckPermission("cailiaoshebei:mrpBase:getMore") + @SaCheckPermission("cailiaoshebei:mrpBase:list") @GetMapping("/getMore") public R> getMore(BusBiddingPlanBo bo) { if (bo.getId() == null) { 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 4c5ca865..7e03b1db 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 @@ -1,6 +1,7 @@ package org.dromara.cailiaoshebei.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.servlet.http.HttpServletResponse; @@ -8,14 +9,12 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.cailiaoshebei.domain.BusPlanDocAssociation; -import org.dromara.cailiaoshebei.domain.bo.BusMaterialbatchdemandplanBo; -import org.dromara.cailiaoshebei.domain.bo.BusPurchaseDocBo; -import org.dromara.cailiaoshebei.domain.bo.FeedbackDto; +import org.dromara.cailiaoshebei.domain.bo.*; +import org.dromara.cailiaoshebei.domain.vo.BusLtnVo; import org.dromara.cailiaoshebei.domain.vo.BusMaterialbatchdemandplanVo; +import org.dromara.cailiaoshebei.domain.vo.BusMrpBaseVo; import org.dromara.cailiaoshebei.domain.vo.BusPurchaseDocVo; -import org.dromara.cailiaoshebei.service.IBusMaterialbatchdemandplanService; -import org.dromara.cailiaoshebei.service.IBusPlanDocAssociationService; -import org.dromara.cailiaoshebei.service.IBusPurchaseDocService; +import org.dromara.cailiaoshebei.service.*; import org.dromara.common.core.domain.R; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; @@ -27,11 +26,16 @@ import org.dromara.common.log.annotation.Log; 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.utils.logistics.LogisticsInquiryDemo; +import org.dromara.common.utils.logistics.LogisticsInquiryUtil; 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.dromara.tender.domain.bo.TenderSupplierInputReq; +import org.dromara.tender.domain.vo.TenderSupplierInputVo; +import org.dromara.tender.service.ITenderSupplierInputService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -64,6 +68,38 @@ public class BusPurchaseDocController extends BaseController { private final IBusBillofquantitiesService busBillofquantitiesService; + private final IBusMrpBaseService busMrpBaseService; + private final ITenderSupplierInputService tenderSupplierInputService; + private final IBusLtnService busLtnService; + + /** + * 查询物资-物流单号列表 + */ + @SaCheckPermission("cailiaoshebei:purchaseDoc:list") + @GetMapping("/getLtnList") + public TableDataInfo getLtnList(BusLtnBo bo, PageQuery pageQuery) { + return busLtnService.queryPageList(bo, pageQuery); + } + + + /** + * 根据材料名查询物资-批次需求计划基础信息列表 + */ + @SaCheckPermission(value = {"cailiaoshebei:purchaseDoc:add","cailiaoshebei:purchaseDoc:edit"},mode = SaMode.OR) + @GetMapping("/getMrpBaseListByName") + public R> getListByName(BusMrpBaseReq req) { + return R.ok(busMrpBaseService.getListByName(req)); + } + + /** + * 根据材料名获取供应商列表 + */ + @SaCheckPermission(value = {"cailiaoshebei:purchaseDoc:add","cailiaoshebei:purchaseDoc:edit"},mode = SaMode.OR) + @GetMapping("/getListByName") + public R> getListByName(TenderSupplierInputReq req) { + return R.ok(tenderSupplierInputService.getListByName(req)); + } + /** * 查询物资-采购联系单列表 */ @@ -102,7 +138,7 @@ public class BusPurchaseDocController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("cailiaoshebei:purchaseDoc:query") +// @SaCheckPermission("cailiaoshebei:purchaseDoc:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -114,7 +150,7 @@ public class BusPurchaseDocController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("cailiaoshebei:purchaseDoc:pdf") + @SaCheckPermission("cailiaoshebei:purchaseDoc:list") @GetMapping("/pdf/{id}") public R getPic(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseUserController.java index d6895eb6..beb91db1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseUserController.java @@ -2,10 +2,14 @@ package org.dromara.cailiaoshebei.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysUserService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -36,6 +40,16 @@ public class BusPurchaseUserController extends BaseController { private final IBusPurchaseUserService busPurchaseUserService; + private final ISysUserService userService; + /** + * 获取系统用户列表 + */ + @SaCheckPermission(value = {"cailiaoshebei:purchaseUser:list","cailiaoshebei:purchaseUser:add","cailiaoshebei:purchaseUser:edit"},mode = SaMode.OR) + @GetMapping("/getUserList") + public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { + return userService.selectPageUserList(user, pageQuery); + } + /** * 查询物资采购人员列表 */ @@ -61,7 +75,7 @@ public class BusPurchaseUserController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("cailiaoshebei:purchaseUser:query") +// @SaCheckPermission("cailiaoshebei:purchaseUser:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -107,7 +121,7 @@ public class BusPurchaseUserController extends BaseController { /** * 新增或修改物资采购人员 */ - @SaCheckPermission("cailiaoshebei:purchaseUser:addOrUpdate") + @SaCheckPermission(value = {"cailiaoshebei:purchaseUser:add","cailiaoshebei:purchaseUser:edit"},mode = SaMode.OR) @Log(title = "物资采购人员", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/addOrUpdate") @@ -121,7 +135,7 @@ public class BusPurchaseUserController extends BaseController { * * @param projectId 项目id */ - @SaCheckPermission("cailiaoshebei:purchaseUser:byProject") + @SaCheckPermission("cailiaoshebei:purchaseUser:list") @GetMapping("/byProject/{projectId}") public R getInfoByProject(@NotNull(message = "主键不能为空") @PathVariable Long projectId) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusTotalsupplyplanController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusTotalsupplyplanController.java index 5893679d..460a9b10 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusTotalsupplyplanController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusTotalsupplyplanController.java @@ -1,6 +1,7 @@ package org.dromara.cailiaoshebei.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.bean.BeanUtil; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; @@ -47,7 +48,7 @@ public class BusTotalsupplyplanController extends BaseController { /** * 获取主数据列表 */ - @SaCheckPermission("design:totalsupplyplan:queryList") + @SaCheckPermission("design:totalsupplyplan:list") @GetMapping("/queryList") public R> queryList(TotalsupplyplanQueryListReq bo) { BusTotalsupplyplanAuditBo busTotalsupplyplanAuditBo = BeanUtil.copyProperties(bo, BusTotalsupplyplanAuditBo.class); @@ -57,7 +58,7 @@ public class BusTotalsupplyplanController extends BaseController { /** * 根据主数据获取到详情 */ - @SaCheckPermission("design:totalsupplyplan:masterData") + @SaCheckPermission(value = {"design:totalsupplyplan:list","design:totalsupplyplan:add","design:totalsupplyplan:edit"},mode = SaMode.OR) @GetMapping("/masterData") public R masterData(MasterDataReq bo) { return R.ok(busTotalsupplyplanService.masterData(bo)); @@ -86,7 +87,7 @@ public class BusTotalsupplyplanController extends BaseController { /** * 导入物资-总供应计划数据 */ - @SaCheckPermission("design:totalsupplyplan:import") + @SaCheckPermission("design:totalsupplyplan:add") @Log(title = "物资-总供应计划", businessType = BusinessType.IMPORT) @PostMapping("/import") public R importData(@RequestPart("file") MultipartFile file) { @@ -98,7 +99,7 @@ public class BusTotalsupplyplanController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("design:totalsupplyplan:query") +// @SaCheckPermission("design:totalsupplyplan:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -130,7 +131,7 @@ public class BusTotalsupplyplanController extends BaseController { /** * 批量修改物资-总供应计划 */ - @SaCheckPermission("design:totalsupplyplan:batchEdit") + @SaCheckPermission("design:totalsupplyplan:edit") @Log(title = "物资-总供应计划", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/batchEdit") diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialIssueController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialIssueController.java index 2e19caa0..8f318246 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialIssueController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialIssueController.java @@ -1,6 +1,7 @@ package org.dromara.materials.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; @@ -12,12 +13,17 @@ 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.contractor.domain.dto.contractor.SubContractorQueryReq; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; +import org.dromara.contractor.service.ISubContractorService; 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.materials.MatMaterialsByFormCodeVo; import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryListVo; import org.dromara.materials.service.IMatMaterialIssueService; +import org.dromara.materials.service.IMatMaterialsService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,6 +42,32 @@ public class MatMaterialIssueController extends BaseController { @Resource private IMatMaterialIssueService matMaterialIssueService; + @Resource + private IMatMaterialsService materialsService; + @Resource + private ISubContractorService contractorService; + + /** + * 查询分包单位列表 + */ + @SaCheckPermission(value = {"materials:materialIssue:add","materials:materialIssue:edit"},mode = SaMode.OR) + @GetMapping("/contractorList") + public R> contractorList(SubContractorQueryReq req) { + return R.ok(contractorService.queryList(req)); + } + + + /** + * 获取材料列表 + * + * @param projectId 项目id + */ + @SaCheckPermission(value = {"materials:materialIssue:add","materials:materialIssue:edit"},mode = SaMode.OR) + @GetMapping("/listByFormCode/{projectId}") + public R> listMaterialsByFormCode(@NotNull(message = "项目id不能为空") + @PathVariable Long projectId) { + return R.ok(materialsService.queryMaterialsByFormCode(projectId)); + } /** * 查询物料领料单列表 @@ -62,7 +94,7 @@ public class MatMaterialIssueController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("materials:materialIssue:query") +// @SaCheckPermission("materials:materialIssue:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialReceiveController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialReceiveController.java index d5905cfc..912091e3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialReceiveController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialReceiveController.java @@ -1,10 +1,21 @@ package org.dromara.materials.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; +import org.dromara.cailiaoshebei.domain.BusPlanDocAssociation; +import org.dromara.cailiaoshebei.domain.bo.BusMaterialbatchdemandplanBo; +import org.dromara.cailiaoshebei.domain.bo.BusPurchaseDocBo; +import org.dromara.cailiaoshebei.domain.vo.BusMaterialbatchdemandplanVo; +import org.dromara.cailiaoshebei.domain.vo.BusPurchaseDocVo; +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.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; @@ -15,15 +26,23 @@ import org.dromara.common.web.core.BaseController; import org.dromara.ctr.domain.bo.CtrExpensesContractBo; import org.dromara.ctr.domain.vo.CtrExpensesContractVo; import org.dromara.ctr.service.ICtrExpensesContractService; +import org.dromara.materials.domain.bo.MatWarehouseBo; import org.dromara.materials.domain.dto.materialreceive.MatMaterialReceiveCreateReq; import org.dromara.materials.domain.dto.materialreceive.MatMaterialReceiveQueryReq; import org.dromara.materials.domain.dto.materialreceive.MatMaterialReceiveUpdateReq; +import org.dromara.materials.domain.vo.MatWarehouseVo; import org.dromara.materials.domain.vo.materialreceive.MatMaterialReceiveVo; import org.dromara.materials.service.IMatMaterialReceiveService; +import org.dromara.materials.service.IMatWarehouseService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * 物料接收单 @@ -40,6 +59,63 @@ public class MatMaterialReceiveController extends BaseController { private IMatMaterialReceiveService matMaterialReceiveService; @Resource private ICtrExpensesContractService ctrExpensesContractService; + @Resource + private IBusPurchaseDocService busPurchaseDocService; + @Resource + private IBusMaterialbatchdemandplanService materialbatchdemandplanService; + @Resource + private IBusPlanDocAssociationService planDocAssociationService; + @Resource + private IMatWarehouseService matWarehouseService; + + + /** + * 查询物资仓库列表 + */ + @SaCheckPermission(value = {"materials:materialReceive:list","materials:materialReceive:add","materials:materialReceive:edit"},mode = SaMode.OR) + @GetMapping("/getWarehouseList") + public TableDataInfo list(MatWarehouseBo bo, PageQuery pageQuery) { + return matWarehouseService.queryPageList(bo, pageQuery); + } + + + /** + * 查询采购单关联的计划 + */ + @SaCheckPermission(value = {"materials:materialReceive:add","materials:materialReceive:edit"},mode = SaMode.OR) + @GetMapping("/planList/{id}") + public R> list(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + List list = planDocAssociationService.list(Wrappers.lambdaQuery(BusPlanDocAssociation.class) + .eq(BusPlanDocAssociation::getDocId, id)); + if (CollectionUtil.isEmpty(list)) { + return R.ok(new ArrayList<>()); + } + Map collect = list.stream() + .filter(Objects::nonNull) // 过滤空对象 + .collect(Collectors.toMap( + BusPlanDocAssociation::getPlanId, + BusPlanDocAssociation::getDemandQuantity, + (existing, replacement) -> existing // 保留第一个遇到的重复键 + )); + BusMaterialbatchdemandplanBo bo = new BusMaterialbatchdemandplanBo(); + bo.setIds(new ArrayList<>(collect.keySet())); + List busMaterialbatchdemandplanVos = materialbatchdemandplanService.queryList(bo); + for (BusMaterialbatchdemandplanVo busMaterialbatchdemandplanVo : busMaterialbatchdemandplanVos) { + busMaterialbatchdemandplanVo.setDemandQuantity(collect.get(busMaterialbatchdemandplanVo.getId())); + } + return R.ok(busMaterialbatchdemandplanVos); + } + + + /** + * 查询物资-采购联系单列表 + */ + @SaCheckPermission(value = {"materials:materialReceive:add","materials:materialReceive:edit"},mode = SaMode.OR) + @GetMapping("/getPurchaseDocList") + public TableDataInfo getPurchaseDocList(BusPurchaseDocBo bo, PageQuery pageQuery) { + return busPurchaseDocService.queryPageList(bo, pageQuery); + } /** * 查询物料接收单列表 @@ -66,7 +142,7 @@ public class MatMaterialReceiveController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("materials:materialReceive:query") +// @SaCheckPermission("materials:materialReceive:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -112,7 +188,7 @@ public class MatMaterialReceiveController extends BaseController { /** * 支出合同列表 */ - @SaCheckPermission("materials:materialReceive:ctrList") + @SaCheckPermission("materials:materialReceive:list") @GetMapping("/ctrList") public TableDataInfo list(CtrExpensesContractBo bo, PageQuery pageQuery) { return ctrExpensesContractService.queryPageList(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java index 5ec39413..c688db9f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java @@ -66,7 +66,7 @@ public class MatMaterialsController extends BaseController { /** * 获取材料使用详情列表 */ - @SaCheckPermission("materials:materials:listUseDetail") + @SaCheckPermission("materials:materials:list") @GetMapping("/listUseDetail") public TableDataInfo listUseDetail(MatMaterialsQueryReq req, PageQuery pageQuery) { return materialsService.queryUseDetailList(req, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsUseRecordController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsUseRecordController.java index 7288c8e7..55d81874 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsUseRecordController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsUseRecordController.java @@ -11,10 +11,19 @@ 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.ctr.domain.bo.CtrExpensesContractBo; +import org.dromara.ctr.domain.vo.CtrExpensesContractVo; +import org.dromara.ctr.service.ICtrExpensesContractService; +import org.dromara.materials.domain.dto.materials.MatMaterialsQueryReq; +import org.dromara.materials.domain.dto.materialsinventory.MatMaterialsInventoryQueryReq; import org.dromara.materials.domain.dto.materialsuserecord.MatMaterialsUseRecordCreateReq; import org.dromara.materials.domain.dto.materialsuserecord.MatMaterialsUseRecordQueryReq; import org.dromara.materials.domain.dto.materialsuserecord.MatMaterialsUseRecordUpdateReq; +import org.dromara.materials.domain.vo.materials.MatMaterialsVo; +import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo; import org.dromara.materials.domain.vo.materialsuserecord.MatMaterialsUseRecordVo; +import org.dromara.materials.service.IMatMaterialsInventoryService; +import org.dromara.materials.service.IMatMaterialsService; import org.dromara.materials.service.IMatMaterialsUseRecordService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,6 +43,31 @@ public class MatMaterialsUseRecordController extends BaseController { @Resource private IMatMaterialsUseRecordService matMaterialsUseRecordService; + @Resource + private IMatMaterialsInventoryService materialsInventoryService; + @Resource + private IMatMaterialsService materialsService; + + + /** + * 查询材料列表 + */ + @SaCheckPermission("materials:materialsUseRecord:list") + @GetMapping("/getMaterialsList") + public TableDataInfo list(MatMaterialsQueryReq req, PageQuery pageQuery) { + return materialsService.queryPageList(req, pageQuery); + } + + + + /** + * 查询材料出/入库列表 + */ + @SaCheckPermission("materials:materialsUseRecord:list") + @GetMapping("/getMaterialsInventoryList") + public TableDataInfo list(MatMaterialsInventoryQueryReq req, PageQuery pageQuery) { + return materialsInventoryService.queryPageList(req, pageQuery); + } /** * 查询材料使用登记列表 @@ -49,7 +83,7 @@ public class MatMaterialsUseRecordController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("materials:materialsUseRecord:query") +// @SaCheckPermission("materials:materialsUseRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicaltypeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicaltypeController.java index bd7a3b8c..e3e95536 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicaltypeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/controller/BusMechanicaltypeController.java @@ -70,7 +70,7 @@ public class BusMechanicaltypeController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("mechanical:mechanicaltype:query") +// @SaCheckPermission("mechanical:mechanicaltype:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java index 97bf326c..e3ffe17c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/BusBillofquantitiesLimitListController.java @@ -2,6 +2,7 @@ package org.dromara.tender.controller; import java.util.List; +import cn.dev33.satoken.annotation.SaMode; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; @@ -61,7 +62,7 @@ public class BusBillofquantitiesLimitListController extends BaseController { /** * 获取所有版本号 */ - @SaCheckPermission("tender:billofquantitiesLimitList:obtainAllVersionNumbers") + @SaCheckPermission(value = {"tender:billofquantitiesLimitList:list","tender:billofquantitiesLimitList:add","tender:billofquantitiesLimitList:edit"},mode = SaMode.OR) @GetMapping("/obtainAllVersionNumbers") public R> obtainAllVersionNumbers(TenderAllVersionNumbersReq bo) { return R.ok(busBillofquantitiesLimitListService.obtainAllVersionNumbers(bo)); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java index e0d50bae..5a8941ab 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleApplyController.java @@ -100,7 +100,7 @@ public class VehVehicleApplyController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("vehicle:vehicleApply:query") +// @SaCheckPermission("vehicle:vehicleApply:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java index 4656550b..e6311da5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInfoController.java @@ -114,7 +114,7 @@ public class VehVehicleInfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("vehicle:vehicleInfo:query") +// @SaCheckPermission("vehicle:vehicleInfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInspectionController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInspectionController.java index fb8d3488..20585c8e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInspectionController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleInspectionController.java @@ -46,7 +46,7 @@ public class VehVehicleInspectionController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("vehicle:vehicleInspection:query") +// @SaCheckPermission("vehicle:vehicleInspection:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java index ee2a0d07..3f689848 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/vehicle/controller/VehVehicleTripController.java @@ -102,7 +102,7 @@ public class VehVehicleTripController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("vehicle:vehicleTrip:query") +// @SaCheckPermission("vehicle:vehicleTrip:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {