Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 1d6f916b5254a31a086f897acb0d4a5913a3e332

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

@@ -3,14 +3,15 @@
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.WarehousingGoodsDto;
import com.ruoyi.system.model.TErpSupplierWarehousing;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpGoodsWarehouseQuery;
import com.ruoyi.system.vo.TErpGoodsVO;
import com.ruoyi.system.vo.TErpGoodsWarehouseLastVO;
import com.ruoyi.system.vo.TErpGoodsWarehouseRecordLastVO;
import com.ruoyi.system.vo.TErpGoodsWarehouseVO;
import com.ruoyi.system.query.TErpInventoryQuery;
import com.ruoyi.system.query.ValidityPeriodWarningQuery;
import com.ruoyi.system.vo.*;

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

/**
@@ -28,4 +29,13 @@
    List<TErpGoodsWarehouseLastVO> detail(String id, String warehouseName, SysUser user);

    PageInfo<TErpGoodsWarehouseRecordLastVO> pageWarehouseList(TErpGoodsWarehouseQuery query, SysUser user);

    void warehousingGoods(@Valid List<WarehousingGoodsDto> dtos, SysUser user);

    PageInfo<ValidityPeriodWarningVo> validityPeriodWarning(ValidityPeriodWarningQuery query, SysUser user);

    PageInfo<PageInventoryListVo> pageInventoryList(TErpInventoryQuery query, SysUser user);

    List<InventoryDetailVo> detailInventory(String id, SysUser user);

}