Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 b95f5fb1af8a80ac03a8da8da3e863ad468bf477

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

@@ -3,10 +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.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;

@@ -38,5 +43,10 @@
    boolean isExit(String goodsIdCode,String quasiNumber);


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


    void inventoryGoods(InventoryDto dto, SysUser user);


}