采购销售审批功能完成

zss

7 天以前 1f53841c3046579d366f061761241127c63da86a

采购销售审批功能完成

 src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java

@@ -150,7 +150,7 @@
        //如果是6销售审批,对应销售关联的表需要更新
        if (approveProcess.getApproveType()==6){
            List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(Wrappers.<SalesLedger>lambdaQuery().eq(SalesLedger::getSalesContractNo, approveProcess.getApproveReason()));
            if (CollectionUtils.isEmpty(salesLedgers)){
            if (!CollectionUtils.isEmpty(salesLedgers)){
                SalesLedger salesLedger = salesLedgers.get(0);
                salesLedger.setApprovalStatus(status);
                salesLedgerMapper.updateById(salesLedger);
@@ -159,7 +159,7 @@
        //如果是5采购审批,对应采购关联的表需要更新
        if (approveProcess.getApproveType()==5){
            List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(Wrappers.<PurchaseLedger>lambdaQuery().eq(PurchaseLedger::getPurchaseContractNumber, approveProcess.getApproveReason()));
            if (CollectionUtils.isEmpty(purchaseLedgers)){
            if (!CollectionUtils.isEmpty(purchaseLedgers)){
                PurchaseLedger purchaseLedger = purchaseLedgers.get(0);
                purchaseLedger.setApprovalStatus(status);
                purchaseLedgerMapper.updateById(purchaseLedger);

 src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java

@@ -153,7 +153,7 @@
    @ApiModelProperty(value = "付款方式")
    private String paymentMethod;

    @ApiModelProperty(value = "1-待审核，2-审批中，3-审批通过，4-审批失败")//默认是1
    @ApiModelProperty(value = "0-待审核，1-审批中，2-审批通过，3-审批不通过，4-已重新提交")//默认是0
    private Integer approvalStatus;



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

@@ -10,6 +10,7 @@
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.ProductMapper;
@@ -378,6 +379,19 @@
        LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
        productRecordLambdaQueryWrapper.in(ProductRecord::getPurchaseLedgerId,ids);
        productRecordMapper.delete(productRecordLambdaQueryWrapper);
        // 删除关联的审批表
        List<String> strings = purchaseLedgerMapper.selectBatchIds(Arrays.asList(ids)).stream().map(PurchaseLedger::getPurchaseContractNumber).distinct().collect(Collectors.toList());
        List<ApproveProcess> list = approveProcessService.list(Wrappers.<ApproveProcess>lambdaQuery()
                .eq(ApproveProcess::getApproveType, 5)
                .in(ApproveProcess::getApproveReason, strings));
        if (CollectionUtils.isNotEmpty(list)){
            List<String> approveIds = list.stream().map(ApproveProcess::getApproveId).distinct().collect(Collectors.toList());
            Long[] ides = approveIds.stream()
                    .filter(s -> s != null && !s.isEmpty()) // 过滤空字符串
                    .map(Long::valueOf)
                    .toArray(Long[]::new);
            approveProcessService.delApprove(ides);
        }
        // 批量删除采购台账
        return purchaseLedgerMapper.deleteBatchIds(Arrays.asList(ids));
    }

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

@@ -129,7 +129,7 @@
    @ApiModelProperty(value = "订单按紧急程度分类(普通/紧急)")
    private String salesType;

    @ApiModelProperty(value = "1-待审核，2-审批中，3-审批通过，4-审批失败")//默认是1
    @ApiModelProperty(value = "0-待审核，1-审批中，2-审批通过，3-审批不通过，4-已重新提交")//默认是0
    private Integer approvalStatus;
}


 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -11,6 +11,7 @@
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.CustomerMapper;
@@ -369,7 +370,21 @@
        LambdaQueryWrapper<SalesLedgerScheduling> in = new LambdaQueryWrapper<SalesLedgerScheduling>()
                .in(SalesLedgerScheduling::getSalesLedgerId, idList);
        salesLedgerSchedulingMapper.delete(in);
        // 2. 再删除主表数据

        // 2. 删除关联的审批表
        List<String> strings = salesLedgerMapper.selectBatchIds(idList).stream().map(SalesLedger::getSalesContractNo).distinct().collect(Collectors.toList());
        List<ApproveProcess> list = approveProcessService.list(Wrappers.<ApproveProcess>lambdaQuery()
                .eq(ApproveProcess::getApproveType, 6)
                .in(ApproveProcess::getApproveReason, strings));
        if (CollectionUtils.isNotEmpty(list)){
            List<String> approveIds = list.stream().map(ApproveProcess::getApproveId).distinct().collect(Collectors.toList());
            Long[] ides = approveIds.stream()
                    .filter(s -> s != null && !s.isEmpty()) // 过滤空字符串
                    .map(Long::valueOf)
                    .toArray(Long[]::new);
            approveProcessService.delApprove(ides);
        }
        // 3. 再删除主表数据
        return salesLedgerMapper.deleteBatchIds(idList);
    }

@@ -458,7 +473,7 @@
                }
            }else {
                //紧急默认通过
                salesLedger.setApprovalStatus(3);
                salesLedger.setApprovalStatus(2);
                salesLedgerMapper.updateById(salesLedger);
            }
            return 1;