Merge remote-tracking branch 'origin/master'

zss

2023-08-15 d9e5ab959b7ff2c578672938c205a7a82765ef9f

 inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Repertory;

import java.util.List;
import java.util.Map;

/**
@@ -24,6 +25,12 @@
     * @param type
     * @return
     */
    IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type);
    IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState);

    /**
     * 查询库存三个字段给添加销售单
     * @return
     */
    List<Map<String,Object>> getSale();
}