Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

7 小时以前 1cf91e355038837f30f2d727507b2229263d7de7

 src/main/java/com/ruoyi/stock/service/StockInventoryService.java

@@ -2,11 +2,14 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.pojo.StockInventory;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;

/**
 * <p>
@@ -25,4 +28,14 @@
    Boolean subtractStockInventory(StockInventoryDto stockInventoryDto);

    R importStockInventory(MultipartFile file);

    void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto);

    IPage<StockInRecordDto> stockInventoryPage(StockInventoryDto stockInventoryDto,Page page);

    IPage<StockInventoryDto> stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page);

    Boolean frozenStock(StockInventoryDto stockInventoryDto);

    Boolean thawStock(StockInventoryDto stockInventoryDto);
}