产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
云
2026-03-21 7b2233d1dab53574facc66b3bebffcd8ca5919de 
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java


@@ -23,8 +23,13 @@


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


import com.ruoyi.other.mapper.TempFileMapper;


import com.ruoyi.other.pojo.TempFile;


import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper;


import com.ruoyi.procurementrecord.pojo.ReturnManagement;


import com.ruoyi.procurementrecord.service.ReturnManagementService;


import com.ruoyi.production.mapper.*;


import com.ruoyi.production.pojo.*;


import com.ruoyi.production.service.ProductionProductMainService;


import com.ruoyi.production.service.impl.ProductionProductMainServiceImpl;


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


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


import com.ruoyi.project.system.mapper.SysDeptMapper;


@@ -97,6 +102,10 @@




    private final ShippingInfoMapper shippingInfoMapper;




    private final ReturnManagementMapper returnManagementMapper;




    private final ReturnManagementService returnManagementService;




    private final InvoiceLedgerMapper invoiceLedgerMapper;




    private final SalesLedgerSchedulingMapper salesLedgerSchedulingMapper;


@@ -146,7 +155,9 @@


    private ProductMapper productMapper;


    @Autowired


    private ProductStructureMapper productStructureMapper;


;


    @Autowired


    private ProductionProductMainService productionProductMainService;


    ;




    @Override


    public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {


@@ -178,7 +189,7 @@


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


                    .orderByDesc(ShippingInfo::getCreateTime)


                    .last("limit 1"));


            if(shippingInfo != null){


            if (shippingInfo != null) {


                product.setShippingStatus(shippingInfo.getStatus());


            }


        }


@@ -350,7 +361,7 @@


//            // 产品大类数据


//            List<Product> productList = productMapper.selectList(new LambdaQueryWrapper<Product>().in(Product::getProductName,


//                    salesLedgerProductImportDtoList.stream().map(SalesLedgerImportDto::getProductCategory).collect(Collectors.toList())));


            List<Map<String,Object>> list = productModelMapper.getProductAndModelList();


            List<Map<String, Object>> list = productModelMapper.getProductAndModelList();


            // 录入人数据


            List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,


                    salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));


@@ -358,7 +369,7 @@


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


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


                        .last("LIMIT 1"));


                if(salesLedger1 != null){


                if (salesLedger1 != null) {


                    continue;


                }


                SalesLedger salesLedger = new SalesLedger();


@@ -391,7 +402,7 @@


                    throw new RuntimeException("销售单号:" + salesLedgerImportDto.getSalesContractNo() + ",无对应产品数据！");


                salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()


                        .map(SalesLedgerProductImportDto::getTaxInclusiveTotalPrice)


                        .reduce(BigDecimal.ZERO,BigDecimal::add));


                        .reduce(BigDecimal.ZERO, BigDecimal::add));


                salesLedgerMapper.insert(salesLedger);






@@ -426,6 +437,8 @@


                    salesLedgerProduct.setApproveStatus(0);


                    salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());


                    salesLedgerProductMapper.insert(salesLedgerProduct);


                    // 添加生产数据


                    salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);


                }


            }




@@ -551,25 +564,29 @@


        // 删除发货台账记录


        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()


                .in(ShippingInfo::getSalesLedgerId, idList));


        if(CollectionUtils.isNotEmpty(shippingInfos)){


            shippingInfoServiceImpl.delete(shippingInfos.stream().map(ShippingInfo::getId).collect(Collectors.toList()));


        if (CollectionUtils.isNotEmpty(shippingInfos)) {


            List<Long> shippingIds = shippingInfos.stream().map(ShippingInfo::getId).collect(Collectors.toList());


            shippingInfoServiceImpl.delete(shippingIds);


            // 删除退货台账记录


            List<ReturnManagement> returnManagements = returnManagementMapper.selectList(new LambdaQueryWrapper<ReturnManagement>()


                    .in(ReturnManagement::getShippingId, shippingIds));


            if (CollectionUtils.isNotEmpty(returnManagements)) {


                List<Long> returnIds = returnManagements.stream().map(ReturnManagement::getId).collect(Collectors.toList());


                returnManagementService.delete(returnIds);


            }


        }




        // 删除附件表


        commonFileService.deleteByBusinessIds(idList, FileNameType.SALE.getValue());




        // 删除生产管控数据


        // 删除生产订单数据


        LambdaQueryWrapper<SalesLedgerScheduling> in = new LambdaQueryWrapper<SalesLedgerScheduling>()


                .in(SalesLedgerScheduling::getSalesLedgerId, idList);


        salesLedgerSchedulingMapper.delete(in);


        // 删除生产派工数据


        LambdaQueryWrapper<SalesLedgerWork> workOrderWrapper = new LambdaQueryWrapper<>();


        workOrderWrapper.in(SalesLedgerWork::getSalesLedgerId, idList);


        salesLedgerWorkMapper.delete(workOrderWrapper);


        // 删除生产核算数据


        LambdaQueryWrapper<SalesLedgerProductionAccounting> reportWrapper = new LambdaQueryWrapper<>();


        reportWrapper.in(SalesLedgerProductionAccounting::getSalesLedgerId, idList);


        salesLedgerProductionAccountingMapper.delete(reportWrapper);


        //查询生产报工id


        ArrayList<Long> mainIdList = productionProductMainService.listMain(idList);


        if (CollectionUtils.isNotEmpty(mainIdList)) {


            mainIdList.stream().forEach(mainId -> {


                productionProductMainService.removeProductMain(mainId);


            });


        }


        // 2. 再删除主表数据


        return salesLedgerMapper.deleteBatchIds(idList);


    }


@@ -591,9 +608,12 @@


            // 3. 新增或更新主表


            if (salesLedger.getId() == null) {


                String contractNo = generateSalesContractNo();


                salesLedger.setSalesContractNo(contractNo);


                salesLedger.setSalesContractNo(salesLedgerDto.getSalesContractNo() == null ? contractNo : salesLedgerDto.getSalesContractNo());


                salesLedgerMapper.insert(salesLedger);


            } else {


                if(StringUtils.isNotEmpty(salesLedgerDto.getSalesContractNo())){


                    salesLedger.setSalesContractNo(salesLedgerDto.getSalesContractNo());


                }


                salesLedgerMapper.updateById(salesLedger);


            }