产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yinrw
昨天 bd63dcea170b3ceb86851f56a7a53b85b77027c2 
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java


@@ -9,10 +9,16 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


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.dto.CustomerPrivatePoolDto;


import com.ruoyi.basic.mapper.CustomerMapper;


import com.ruoyi.basic.mapper.CustomerPrivatePoolMapper;


import com.ruoyi.basic.mapper.ProductMapper;


import com.ruoyi.basic.mapper.ProductModelMapper;


import com.ruoyi.basic.pojo.Customer;


import com.ruoyi.basic.pojo.CustomerPrivatePool;


import com.ruoyi.common.enums.FileNameType;


import com.ruoyi.common.enums.SaleEnum;


import com.ruoyi.common.exception.base.BaseException;


@@ -25,6 +31,7 @@


import com.ruoyi.framework.web.domain.AjaxResult;


import com.ruoyi.other.mapper.TempFileMapper;


import com.ruoyi.other.pojo.TempFile;


import com.ruoyi.production.dto.ProductOrderDto;


import com.ruoyi.production.mapper.*;


import com.ruoyi.production.service.ProductionProductMainService;


import com.ruoyi.project.system.domain.SysDept;


@@ -38,6 +45,7 @@


import com.ruoyi.sales.mapper.*;


import com.ruoyi.sales.pojo.*;


import com.ruoyi.sales.service.ISalesLedgerService;


import com.ruoyi.sales.service.SalesLedgerProductionRefService;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.io.FilenameUtils;


@@ -82,34 +90,64 @@


    private static final String LOCK_PREFIX = "contract_no_lock:";


    private static final long LOCK_WAIT_TIMEOUT = 10; // 锁等待超时时间（秒）


    private static final long LOCK_EXPIRE_TIME = 30;  // 锁自动过期时间（秒）


    private final AccountIncomeService accountIncomeService;


    private final SalesLedgerMapper salesLedgerMapper;


    private final CustomerMapper customerMapper;


    private final SalesLedgerProductMapper salesLedgerProductMapper;


    private final SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;


    private final CommonFileMapper commonFileMapper;


    private final TempFileMapper tempFileMapper;


    private final ReceiptPaymentMapper receiptPaymentMapper;


    private final ShippingInfoServiceImpl shippingInfoServiceImpl;


    private final CommonFileServiceImpl commonFileService;


    private final ShippingInfoMapper shippingInfoMapper;


    private final InvoiceLedgerMapper invoiceLedgerMapper;


    private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;


    private final SalesLedgerWorkMapper salesLedgerWorkMapper;


    private final SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;


    private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;


    private final InvoiceRegistrationMapper invoiceRegistrationMapper;


    private final ProductOrderMapper productOrderMapper;


    private final ProcessRouteMapper processRouteMapper;


    private final ProductProcessRouteMapper productProcessRouteMapper;


    private final ProcessRouteItemMapper processRouteItemMapper;


    private final ProductProcessRouteItemMapper productProcessRouteItemMapper;


    private final ProductWorkOrderMapper productWorkOrderMapper;


    private final ProductionProductMainMapper productionProductMainMapper;


    private final ProductionProductOutputMapper productionProductOutputMapper;


    private final ProductionProductInputMapper productionProductInputMapper;


    private final QualityInspectMapper qualityInspectMapper;


    private final RedisTemplate<String, String> redisTemplate;


    @Autowired


    private AccountIncomeService accountIncomeService;


    @Autowired


    private SalesLedgerMapper salesLedgerMapper;


    @Autowired


    private CustomerMapper customerMapper;


    @Autowired


    private SalesLedgerProductMapper salesLedgerProductMapper;


    @Autowired


    private SalesLedgerProductServiceImpl salesLedgerProductServiceImpl;


    @Autowired


    private CommonFileMapper commonFileMapper;


    @Autowired


    private TempFileMapper tempFileMapper;


    @Autowired


    private ReceiptPaymentMapper receiptPaymentMapper;


    @Autowired


    private ShippingInfoServiceImpl shippingInfoServiceImpl;


    @Autowired


    private CommonFileServiceImpl commonFileService;


    @Autowired


    private ShippingInfoMapper shippingInfoMapper;


    @Autowired


    private InvoiceLedgerMapper invoiceLedgerMapper;


    @Autowired


    private SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;


    @Autowired


    private SalesLedgerWorkMapper salesLedgerWorkMapper;


    @Autowired


    private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;


    @Autowired


    private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;


    @Autowired


    private InvoiceRegistrationMapper invoiceRegistrationMapper;


    @Autowired


    private ProductOrderMapper productOrderMapper;


    @Autowired


    private ProcessRouteMapper processRouteMapper;


    @Autowired


    private ProductProcessRouteMapper productProcessRouteMapper;


    @Autowired


    private ProcessRouteItemMapper processRouteItemMapper;


    @Autowired


    private ProductProcessRouteItemMapper productProcessRouteItemMapper;


    @Autowired


    private ProductWorkOrderMapper productWorkOrderMapper;


    @Autowired


    private ProductionProductMainMapper productionProductMainMapper;


    @Autowired


    private ProductionProductOutputMapper productionProductOutputMapper;


    @Autowired


    private ProductionProductInputMapper productionProductInputMapper;


    @Autowired


    private QualityInspectMapper qualityInspectMapper;


    @Autowired


    private RedisTemplate<String, String> redisTemplate;


    @Autowired


    private IApproveProcessService approveProcessService;


    @Autowired


    private SysDeptMapper sysDeptMapper;


    @Value("${file.upload-dir}")


@@ -128,6 +166,12 @@


    ;


    @Autowired


    private SysUserMapper sysUserMapper;


    @Autowired


    private CustomerPrivatePoolMapper customerPrivatePoolMapper;


    @Autowired


    private SalesLedgerProductionRefService salesLedgerProductionRefService;


    @Autowired


    private SalesLedgerProductionRefMapper salesLedgerProductionRefMapper;




    @Override


    public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {


@@ -154,7 +198,7 @@


            // 查询退货信息


            List<Long> productIds = salesLedgerProducts.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());


            List<SimpleReturnOrderGroupDto> groupListByProductIds = new ArrayList<>();


            if(CollectionUtils.isNotEmpty(productIds)){


            if (CollectionUtils.isNotEmpty(productIds)) {


                groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);


            }


            Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getSalesLedgerProductId, SimpleReturnOrderGroupDto::getSumReturnQuantity));


@@ -174,7 +218,8 @@


        if (salesLedger == null) {


            throw new BaseException("台账不存在");


        }




        List<ProductOrderDto> productionOrdersBySalesLedgerId = getProductionOrdersBySalesLedgerId(salesLedger.getId());


        salesLedger.setProductionOrders(productionOrdersBySalesLedgerId);


        // 2. 查询子表


        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();


        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());


@@ -460,39 +505,75 @@


    }




    @Override


    public IPage<SalesLedgerDto> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {


        IPage<SalesLedgerDto> salesLedgerDtoIPage = salesLedgerMapper.listSalesLedgerAndShipped(page, salesLedgerDto);


        for (SalesLedgerDto salesLedger : salesLedgerDtoIPage.getRecords()) {


            LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();


            productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());


            productWrapper.eq(SalesLedgerProduct::getType, 1);


            List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);


            for (SalesLedgerProduct product : products) {


                product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());


                // 提供临时未开票数，未开票金额供前段计算


                product.setTempnoInvoiceAmount(product.getNoInvoiceAmount());


                product.setTempNoInvoiceNum(product.getNoInvoiceNum());


                product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());


                product.setRegisterDate(LocalDateTime.now());


                // 发货信息


                ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()


                        .eq(ShippingInfo::getSalesLedgerProductId, product.getId())


                        .orderByDesc(ShippingInfo::getCreateTime)


                        .last("limit 1"));


                if (shippingInfo != null) {


                    product.setShippingStatus(shippingInfo.getStatus());


                }


    public IPage<AfterSalesLedgerDto> listSalesLedger(AfterSalesLedgerDto salesLedgerDto, Page page) {


        IPage<AfterSalesLedgerDto> salesLedgerDtoIPage = salesLedgerMapper.listSalesLedgerAndShipped(page, salesLedgerDto);


        for (AfterSalesLedgerDto salesLedger : salesLedgerDtoIPage.getRecords()) {


            SalesLedgerProduct product = salesLedgerProductMapper.selectById(salesLedger.getSalesLedgerProductId());


            product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());


            // 提供临时未开票数，未开票金额供前段计算


            product.setTempnoInvoiceAmount(product.getNoInvoiceAmount());


            product.setTempNoInvoiceNum(product.getNoInvoiceNum());


            product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());


            product.setRegisterDate(LocalDateTime.now());


            // 发货信息


            ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()


                    .eq(ShippingInfo::getSalesLedgerProductId, product.getId())


                    .orderByDesc(ShippingInfo::getCreateTime)


                    .last("limit 1"));


            product.setShippingCarNumber(shippingInfo.getShippingCarNumber());


            product.setShippingDate(shippingInfo.getShippingDate());


            if (shippingInfo != null) {


                product.setShippingStatus(shippingInfo.getStatus());


            }


            // 过滤只保留发货记录


            products = products.stream().filter(product -> "已发货".equals(product.getShippingStatus())).collect(Collectors.toList());


            if (!products.isEmpty()) {


                salesLedger.setHasChildren(true);


                salesLedger.setProductData(products);


            }


            List<SalesLedgerProduct> afterSalesLedgerDtos = new ArrayList<>();


            afterSalesLedgerDtos.add(product);


            salesLedger.setProductData(afterSalesLedgerDtos);


        }


        return salesLedgerDtoIPage;


    }




    @Override


    public SalesLedgerDto getSalesByCode(SalesLedgerDto salesLedgerDto) {


        // 1. 查询主表


        SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()


                .eq(SalesLedger::getSalesContractNo, salesLedgerDto.getSalesContractNo())


                .last("LIMIT 1"));


        if (salesLedger == null) {


            throw new BaseException("销售台账不存在");


        }




        // 2. 查询子表


        LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();


        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId())


                .eq(SalesLedgerProduct::getType, 1);


        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);




        return salesLedgerDtoIPage;


        // 4. 转换 DTO


        SalesLedgerDto resultDto = new SalesLedgerDto();


        BeanUtils.copyProperties(salesLedger, resultDto);


        if (!products.isEmpty()) {


            resultDto.setHasChildren(true);


            resultDto.setProductData(products);


        }


        return resultDto;


    }




    @Override


    public List<ProductOrderDto> getProductionOrdersBySalesLedgerId(Long salesLedgerId) {


        List<Long> productOrderIds = salesLedgerProductionRefMapper.getProductionOrderIdsBySalesLedgerId(salesLedgerId);


        if (productOrderIds == null || productOrderIds.isEmpty()) {


            return Collections.emptyList();


        }


        return productOrderMapper.listByProductOrderId(productOrderIds);


    }




    @Override


    public void getProductionOrders(List<SalesLedger> records) {


        List<Long> ledgerIdList = records.stream()


                .map(SalesLedger::getId)


                .collect(Collectors.toList());






    }




    /**


@@ -592,7 +673,7 @@


    public int addOrUpdateSalesLedger(SalesLedgerDto salesLedgerDto) {


        try {


            // 1. 校验客户信息


            Customer customer = customerMapper.selectById(salesLedgerDto.getCustomerId());


            CustomerPrivatePoolDto customer = customerPrivatePoolMapper.selectInfo(salesLedgerDto.getCustomerId());


            if (customer == null) {


                throw new BaseException("客户不存在");


            }


@@ -607,9 +688,21 @@


                salesLedger.setSalesContractNo(contractNo);


                salesLedgerMapper.insert(salesLedger);


            } else {


                ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()


                        .eq(ApproveProcess::getApproveType, 9)


                        .eq(ApproveProcess::getApproveReason, salesLedger.getSalesContractNo())


                        .eq(ApproveProcess::getApproveDelete, 0)


                        .last("limit 1"));


                if (one != null) {


                    approveProcessService.delByIds(Collections.singletonList(one.getId()));


                }


                salesLedgerMapper.updateById(salesLedger);


            }


            LoginUser loginUser = SecurityUtils.getLoginUser();


            addApproveByPurchase(loginUser, salesLedger);




            salesLedger.setApprovalStatus(1);


            this.updateById(salesLedger);


            // 4. 处理子表数据


            List<SalesLedgerProduct> productList = salesLedgerDto.getProductData();


            if (productList != null && !productList.isEmpty()) {


@@ -623,14 +716,50 @@


                );


            }




            // 5. 迁移临时文件到正式目录


            //5. 绑定销售订单和生产订单


            bindSalesOrderAndProductionOrder(salesLedgerDto.getProductionOrderIds(), salesLedger.getId());




            // 6. 迁移临时文件到正式目录


            if (salesLedgerDto.getTempFileIds() != null && !salesLedgerDto.getTempFileIds().isEmpty()) {


                migrateTempFilesToFormal(salesLedger.getId(), salesLedgerDto.getTempFileIds());


            }


            return 1;


        } catch (IOException e) {


            throw new BaseException("文件迁移失败: " + e.getMessage());


        } catch (Exception e) {


            throw new RuntimeException(e);


        }


    }




    private void bindSalesOrderAndProductionOrder(List<Long> productionOrderIds, Long salesLedgerId) {


        // 先删除该销售台账所有旧关联


        LambdaQueryWrapper<SalesLedgerProductionRef> deleteWrapper = Wrappers.lambdaQuery();


        deleteWrapper.eq(SalesLedgerProductionRef::getSalesLedgerId, salesLedgerId);


        salesLedgerProductionRefMapper.delete(deleteWrapper);




        if (productionOrderIds == null || productionOrderIds.isEmpty()) {


            return;


        }


        List<SalesLedgerProductionRef> refList = productionOrderIds.stream()


                .map(productOrderId -> {


                    SalesLedgerProductionRef ref = new SalesLedgerProductionRef();


                    ref.setSalesLedgerId(salesLedgerId);


                    ref.setProductOrderId(productOrderId);


                    return ref;


                })


                .collect(Collectors.toList());


        salesLedgerProductionRefService.saveBatch(refList);


    }




    public void addApproveByPurchase(LoginUser loginUser, SalesLedger salesLedger) throws Exception {


        ApproveProcessVO approveProcessVO = new ApproveProcessVO();


        approveProcessVO.setApproveType(9);


        approveProcessVO.setApproveDeptId(loginUser.getDeptIds()[0]);


        approveProcessVO.setApproveReason(salesLedger.getSalesContractNo());


        approveProcessVO.setApproveUserIds(salesLedger.getApproveUserIds());


        approveProcessVO.setApproveUser(loginUser.getUserId());


        approveProcessVO.setApproveTime(LocalDate.now().toString());


        approveProcessService.addApprove(approveProcessVO);


    }




    /**


@@ -736,7 +865,7 @@


                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());


                salesLedgerProductMapper.insert(salesLedgerProduct);


                // 添加生产数据


                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);


                //salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);


            }


        }


    }