产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yaowanxin
4 天以前 277b5047d00a3e9094bafd5ecb078976fbf6a92d 
 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;




@@ -66,11 +65,11 @@




    @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);


@@ -80,8 +79,8 @@


                    BigDecimal invoiceNum = BigDecimal.ZERO;


                    BigDecimal invoiceAmount = 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());


                        }


                    }


@@ -104,7 +103,7 @@


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


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


        if (deletedProducts.isEmpty()) {


            return 0;


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


        }




        // 可能属于多个主表


@@ -222,6 +221,8 @@


                        String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);


                        ProductWorkOrder productWorkOrder = new ProductWorkOrder();


                        productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());


                        productWorkOrder.setProductOrderId(productOrder.getId());


                        productWorkOrder.setPlanQuantity(salesLedgerProduct.getQuantity());


                        productWorkOrder.setWorkOrderNo(workOrderNoStr);


                        productWorkOrder.setStatus(1);