Merge remote-tracking branch 'origin/master'

xuhy

20 小时以前 206fcf7d6afae27856f63cf0158f53b61fa1b86f

 ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java

@@ -3,11 +3,17 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.dto.InventoryDto;
import com.ruoyi.system.dto.InventoryGoodsDto;
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.query.TErpGoodsInventoryQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.vo.TErpGoodsInventoryVO;
import com.ruoyi.system.vo.TErpGoodsVO;

import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import java.util.List;

/**
 * <p>
@@ -26,7 +32,24 @@
     */
    PageInfo<TErpGoodsVO> pageList(TErpGoodsQuery query, SysUser user);


    /**
     *  导出
     * @param query
     * @return
     */
    List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user);

    boolean isExit(String goodsIdCode,String quasiNumber);


    PageInfo<TErpGoodsInventoryVO> pageInventoryGoodsPageList(@Valid TErpGoodsInventoryQuery query, SysUser user);


    void inventoryGoods(InventoryDto dto, SysUser user);


    List<TErpGoodsInventoryVO> pageInventoryGoodsList(@Valid String warehouseId, SysUser user);


}