产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zss
2 天以前 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe 
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java


@@ -12,10 +12,12 @@


import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;


import com.ruoyi.sales.mapper.SalesLedgerMapper;


import com.ruoyi.sales.mapper.SalesLedgerProductMapper;


import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;


import com.ruoyi.sales.pojo.SalesLedger;


import com.ruoyi.sales.pojo.SalesLedgerProduct;


import com.ruoyi.sales.service.ISalesLedgerProductService;


import lombok.AllArgsConstructor;


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


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.CollectionUtils;


@@ -24,10 +26,7 @@


import java.math.BigDecimal;


import java.time.LocalDate;


import java.time.format.DateTimeFormatter;


import java.util.Arrays;


import java.util.List;


import java.util.Objects;


import java.util.Set;


import java.util.*;


import java.util.function.Function;


import java.util.stream.Collectors;




@@ -56,6 +55,7 @@


    private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;




    private ProcessRouteMapper processRouteMapper;


    private ProductProcessRouteMapper productProcessRouteMapper;




    private ProductWorkOrderMapper productWorkOrderMapper;




@@ -66,11 +66,12 @@




    @Override


    public List<SalesLedgerProduct> selectSalesLedgerProductList(SalesLedgerProduct salesLedgerProduct) {


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


        queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerProduct.getSalesLedgerId())


                .eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());


        List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(queryWrapper);


        if (!CollectionUtils.isEmpty(salesLedgerProducts)) {


//        LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();


//        queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerProduct.getSalesLedgerId())


//                .eq(SalesLedgerProduct::getType, salesLedgerProduct.getType());


        List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectSalesLedgerProductList(salesLedgerProduct);


        if(!CollectionUtils.isEmpty(salesLedgerProducts)){


            // 开票


            InvoiceRegistrationProductDto invoiceRegistrationProductDto = new InvoiceRegistrationProductDto();


            invoiceRegistrationProductDto.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId().intValue());


            List<InvoiceRegistrationProductDto> invoiceRegistrationProductDtoList = invoiceRegistrationProductMapper.invoiceRegistrationProductList(invoiceRegistrationProductDto);


@@ -79,14 +80,20 @@


                for (SalesLedgerProduct ledgerProduct : salesLedgerProducts) {


                    BigDecimal invoiceNum = BigDecimal.ZERO;


                    BigDecimal invoiceAmount = BigDecimal.ZERO;


                    BigDecimal noInvoiceNum = BigDecimal.ZERO;


                    BigDecimal noInvoiceAmount = BigDecimal.ZERO;


                    for (InvoiceRegistrationProductDto registrationProductDto : invoiceRegistrationProductDtoList) {


                        if (ledgerProduct.getId().intValue() == registrationProductDto.getSalesLedgerProductId()) {


                            invoiceNum = invoiceNum.add(registrationProductDto.getInvoiceNum());


                        if(ledgerProduct.getId().intValue() == registrationProductDto.getSalesLedgerProductId()){


                            invoiceNum =  invoiceNum.add(registrationProductDto.getInvoiceNum());


                            invoiceAmount = invoiceAmount.add(registrationProductDto.getInvoiceAmount());


                            noInvoiceNum = ledgerProduct.getQuantity().subtract(invoiceNum);


                            noInvoiceAmount = ledgerProduct.getTaxInclusiveTotalPrice().subtract(invoiceAmount);


                        }


                    }


                    ledgerProduct.setInvoiceNum(invoiceNum);


                    ledgerProduct.setInvoiceAmount(invoiceAmount);


                    ledgerProduct.setNoInvoiceNum(noInvoiceNum);


                    ledgerProduct.setNoInvoiceAmount(noInvoiceAmount);


                }


            }




@@ -104,7 +111,7 @@


        // 1. 先查询要删除的子表记录，获取对应的 salesLedgerId


        List<SalesLedgerProduct> deletedProducts = salesLedgerProductMapper.selectBatchIds(Arrays.asList(ids));


        if (deletedProducts.isEmpty()) {


            return 0;


            return 0; // 没有可删除的数据


        }




        // 可能属于多个主表


@@ -130,7 +137,7 @@


            // 批量查询processRouteItems


            List<ProductProcessRouteItem> allRouteItems = productProcessRouteItemMapper.selectList(


                    new LambdaQueryWrapper<ProductProcessRouteItem>()


                            .in(ProductProcessRouteItem::getRouteId, orderIds)


                            .in(ProductProcessRouteItem::getProductOrderId, orderIds)


            );




            if (!CollectionUtils.isEmpty(allRouteItems)) {


@@ -143,9 +150,13 @@


                                .in(ProductWorkOrder::getProductProcessRouteItemId, routeItemIds));


            }




            // 批量删除processRouteItem


            // 批量删除productProcessRouteItem


            productProcessRouteItemMapper.delete(new LambdaQueryWrapper<ProductProcessRouteItem>()


                            .in(ProductProcessRouteItem::getRouteId, orderIds));


                            .in(ProductProcessRouteItem::getProductOrderId, orderIds));




            // 批量删除productProcessRoute


            productProcessRouteMapper.delete(new LambdaQueryWrapper<ProductProcessRoute>()


                    .in(ProductProcessRoute::getProductOrderId, orderIds));




            // 批量删除productOrder


            productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()


@@ -184,10 +195,20 @@


            productOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());


            productOrder.setProductModelId(salesLedgerProduct.getId());


            productOrder.setNpsNo("SC" + String.format("%08d", salesLedgerProduct.getId()));


            productOrder.setQuantity(salesLedgerProduct.getQuantity());//需求数量


            productOrder.setCompleteQuantity(BigDecimal.ZERO);//完成数量


            productOrderMapper.insert(productOrder);




            ProcessRoute processRoute = processRouteMapper.selectOne(new QueryWrapper<ProcessRoute>().lambda().eq(ProcessRoute::getProductModelId, salesLedgerProduct.getProductModelId()));


            if (processRoute != null) {


                //新增生产订单工艺路线主表


                ProductProcessRoute productProcessRoute = new ProductProcessRoute();


                productProcessRoute.setProductModelId(processRoute.getProductModelId());


                productProcessRoute.setProcessRouteCode(processRoute.getProcessRouteCode());


                productProcessRoute.setProductOrderId(productOrder.getId());


                productProcessRoute.setBomId(processRoute.getBomId());


                productProcessRouteMapper.insert(productProcessRoute);


                //新增生产订单工艺路线子表


                List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));


                // 生成当前日期的前缀：年月日


                String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));


@@ -195,7 +216,8 @@


                    ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();


                    productProcessRouteItem.setProductModelId(processRouteItem.getProductModelId());


                    productProcessRouteItem.setProcessId(processRouteItem.getProcessId());


                    productProcessRouteItem.setRouteId(productOrder.getId());


                    productProcessRouteItem.setProductOrderId(productOrder.getId());


                    productProcessRouteItem.setProductRouteId(productProcessRoute.getId());


                    int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);


                    if (insert > 0) {


                        // 查询今日已存在的最大工单号


@@ -223,6 +245,7 @@


                        ProductWorkOrder productWorkOrder = new ProductWorkOrder();


                        productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());


                        productWorkOrder.setProductOrderId(productOrder.getId());


                        productWorkOrder.setQuantity(salesLedgerProduct.getQuantity());


                        productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());


                        productWorkOrder.setWorkOrderNo(workOrderNoStr);


                        productWorkOrder.setStatus(1);