产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liyong
6 天以前 714ec3cc8e9c0ab12660c1371e832b7dc5532964 
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java


@@ -9,8 +9,9 @@


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.bean.vo.ApproveProcessVO;


import com.ruoyi.approve.service.IApproveProcessService;


import com.ruoyi.basic.mapper.CustomerMapper;


import com.ruoyi.basic.mapper.ProductMapper;


import com.ruoyi.basic.mapper.ProductModelMapper;


import com.ruoyi.basic.pojo.Customer;


import com.ruoyi.common.enums.FileNameType;


@@ -25,7 +26,6 @@


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


import com.ruoyi.other.mapper.TempFileMapper;


import com.ruoyi.other.pojo.TempFile;


import com.ruoyi.production.mapper.*;


import com.ruoyi.production.service.ProductionProductMainService;


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


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


@@ -33,7 +33,6 @@


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


import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;


import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;


import com.ruoyi.quality.mapper.QualityInspectMapper;


import com.ruoyi.sales.dto.*;


import com.ruoyi.sales.mapper.*;


import com.ruoyi.sales.pojo.*;


@@ -43,7 +42,6 @@


import org.apache.commons.io.FilenameUtils;


import org.jetbrains.annotations.Nullable;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.data.redis.core.script.DefaultRedisScript;


@@ -94,40 +92,17 @@


    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 SysDeptMapper sysDeptMapper;


    private final IApproveProcessService approveProcessService;


    private final SysDeptMapper sysDeptMapper;


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


    private String uploadDir;


    @Autowired


    private ProductModelMapper productModelMapper;




    @Autowired


    private ProductMapper productMapper;


    @Autowired


    private ProductStructureMapper productStructureMapper;


    @Autowired


    private ProductionProductMainService productionProductMainService;


    @Autowired


    private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;


    ;


    @Autowired


    private SysUserMapper sysUserMapper;


    private final ProductModelMapper productModelMapper;


    private final ProductionProductMainService productionProductMainService;


    private final PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;


    private final SysUserMapper sysUserMapper;




    @Override


    public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {


@@ -154,7 +129,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));


@@ -615,7 +590,7 @@


            // 4. 处理子表数据


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


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


                handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()));


                handleSalesLedgerProducts(salesLedger.getId(), productList, EnumUtil.fromCode(SaleEnum.class, salesLedgerDto.getType()), salesLedger.getSalesContractNo());


                updateMainContractAmount(


                        salesLedger.getId(),


                        productList,


@@ -713,7 +688,7 @@


    // 文件迁移方法




    @Override


    public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type) {


    public void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, SaleEnum type, String contractNo) {


        // 按ID分组，区分新增和更新的记录


        Map<Boolean, List<SalesLedgerProduct>> partitionedProducts = products.stream()


                .peek(p -> p.setSalesLedgerId(salesLedgerId))


@@ -737,8 +712,22 @@


                salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());


                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());


                salesLedgerProductMapper.insert(salesLedgerProduct);


                //添加销售审批  审批成功之后添加生产数据


                ApproveProcessVO approveProcessVO = new ApproveProcessVO();


                approveProcessVO.setApproveType(9);


                approveProcessVO.setApproveDeptId(SecurityUtils.getDeptId()[0]);


                approveProcessVO.setApproveReason(contractNo);


                approveProcessVO.setRecordId(salesLedgerProduct.getId());


                approveProcessVO.setApproveUser(SecurityUtils.getUserId());


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


                approveProcessVO.setApproveId(salesLedgerProduct.getId().toString());


                try {


                    approveProcessService.addApprove(approveProcessVO);


                }catch (Exception e) {


                    log.error("添加销售审批异常", e);


                }


                // 添加生产数据


                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);


//                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);


            }


        }


    }