增加日志

huminmin

10 天以前 d2038a623e02c2d7bb6b95a908832c0432adf2f0

 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java

@@ -1,35 +1,31 @@
package com.ruoyi.sales.controller;

import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ShippingInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;

/**
 * 产品信息Controller
 * 
 *
 * @author ruoyi
 * @date 2025-05-08
 */
@@ -41,12 +37,17 @@
    private ISalesLedgerProductService salesLedgerProductService;
    @Autowired
    private ProcurementRecordService procurementRecordService;
    @Autowired
    private StockUtils stockUtils;
    @Autowired
    private ShippingInfoService shippingInfoService;


    /**
     * 回款登记分页查询
     */
    @GetMapping("/listPageSalesLedger")
    @Log(title = "回款登记分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
        return AjaxResult.success(list);
@@ -57,6 +58,7 @@
     * 付款登记分页查询
     */
    @GetMapping("/listPagePurchaseLedger")
    @Log(title = "付款登记分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
        return AjaxResult.success(list);
@@ -67,19 +69,42 @@
     * 查询产品信息列表
     */
    @GetMapping("/list")
    public AjaxResult list(SalesLedgerProduct salesLedgerProduct)
    {
    @Log(title = "查询产品信息列表", businessType = BusinessType.OTHER)
    public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
        List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
        list.forEach(item -> {
            ProcurementPageDto procurementDto = new ProcurementPageDto();
            procurementDto.setSalesLedgerProductId(item.getId());
            procurementDto.setProductCategory(item.getProductCategory());
            IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
            if(result.getRecords().size()>0) {
                ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
                if (item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0()) >= 0 && item.getApproveStatus() == 0) {
            List<ShippingInfo> shippings = shippingInfoService.list(new LambdaQueryWrapper<ShippingInfo>()
                    .eq(ShippingInfo::getSalesLedgerId, salesLedgerProduct.getSalesLedgerId())
                    .eq(ShippingInfo::getSalesLedgerProductId, item.getId()));
            BigDecimal total = shippings.stream().map(ShippingInfo::getShippedQty).reduce(BigDecimal.ZERO, BigDecimal::add);
            item.setShippedQty(total);
            if (total.compareTo(BigDecimal.ZERO) == 0) {
                item.setShippingStatus("待发货");
            }
            if (total.compareTo(item.getQuantity()) == 0) {
                item.setShippingStatus("已发货");
            }
            if (total.compareTo(item.getQuantity()) < 0) {
                item.setShippingStatus("发货中");
            }
            if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
                item.setFutureTickets(BigDecimal.ZERO);
            }
            if (item.getFutureTicketsAmount().compareTo(BigDecimal.ZERO) == 0) {
                item.setFutureTicketsAmount(BigDecimal.ZERO);
            }
//            ProcurementPageDto procurementDto = new ProcurementPageDto();
//            procurementDto.setSalesLedgerProductId(item.getId());
//            procurementDto.setProductCategory(item.getProductCategory());
//            IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
//            BigDecimal stockQuantity = stockUtils.getStockQuantity(item.getProductModelId()).get("stockQuantity");

//                ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
            if (item.getApproveStatus() != 2) {
                if (item.getHasSufficientStock() == 0) {
                    item.setApproveStatus(0);
                } else {
                    item.setApproveStatus(1);
                    salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
                }
            }
        });
@@ -102,6 +127,7 @@
     * 获取产品信息详细信息
     */
    @GetMapping(value = "/{id}")
    @Log(title = "查询产品信息详细信息", businessType = BusinessType.OTHER)
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(salesLedgerProductService.selectSalesLedgerProductById(id));
@@ -129,4 +155,11 @@
        }
        return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
    }

    //根据产品id获取bom判断库存是否充足
    @GetMapping("/judgmentInventory")
    @Log(title = "判断库存是否充足", businessType = BusinessType.OTHER)
    public R judgmentInventory(SalesLedgerProduct salesLedgerProduct) {
        return  salesLedgerProductService.judgmentInventory(salesLedgerProduct);
    }
}