yys 优化采购审批模块

maven

21 小时以前 b1b1c6b65cef9a4f6d9f3d7b09a31b40535ef63a

yys 优化采购审批模块

 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java

@@ -189,6 +189,14 @@
    }

    /**
     * 查询采购台账和产品父子列表
     */
    @GetMapping("/getPurchaseByCode")
    public PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto) {
        return purchaseLedgerService.getPurchaseByCode(purchaseLedgerDto);
    }

    /**
     * 删除采购台账
     */
    @Log(title = "采购台账", businessType = BusinessType.DELETE)

 src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java

@@ -43,4 +43,6 @@
    String getPurchaseNo();

    AjaxResult importData(MultipartFile file);

    PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
}

 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java

@@ -163,6 +163,7 @@
        purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
        purchaseLedger.setRecorderName(sysUser.getNickName());
        purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
        purchaseLedger.setApprovalStatus(1);
        // 3. 新增或更新主表
        if (purchaseLedger.getId() == null) {
            purchaseLedgerMapper.insert(purchaseLedger);
@@ -724,6 +725,32 @@
        return AjaxResult.success("导入失败");
    }

    @Override
    public PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto) {
        // 1. 查询主表
        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
                .eq(PurchaseLedger::getPurchaseContractNumber, purchaseLedgerDto.getPurchaseContractNumber())
                .last("LIMIT 1"));
        if (purchaseLedger == null) {
            throw new BaseException("采购台账不存在");
        }

        // 2. 查询子表
        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
                .eq(SalesLedgerProduct::getType, 2);
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);

        // 4. 转换 DTO
        PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
        BeanUtils.copyProperties(purchaseLedger, resultDto);
        if (!products.isEmpty()) {
            resultDto.setHasChildren(true);
            resultDto.setProductData(products);
        }
        return resultDto;
    }

    public void addApproveByPurchase(LoginUser loginUser,PurchaseLedger purchaseLedger) throws Exception {
        ApproveProcessVO approveProcessVO = new ApproveProcessVO();
        approveProcessVO.setApproveType(5);

 src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java

@@ -37,7 +37,7 @@
    @ApiModelProperty(value = "销售报价产品表id")
    private Long salesLedgerProductId;

    @ApiModelProperty(value = "状态 待审核 审核中 ，审核拒绝 审核通过")
    @ApiModelProperty(value = "状态 待审核 审核中 ，审核拒绝 审核通过 已发货")
    @Excel(name = "状态")
    private String status;