Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java

@@ -4,6 +4,7 @@
import java.util.Map;

import com.nanometer.smartlab.entity.OpeApply;
import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;

import com.nanometer.smartlab.entity.OpeWarehouseReserve;
@@ -18,9 +19,13 @@
    @SuppressWarnings("rawtypes")
    int getOpeWarehouseReserveTotalCount(Map params) throws DataAccessException;

    List<OpeWarehouseReserve> getOpeWarehouseReserveList2(Map params) throws DataAccessException;

    void insertOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);

    int updateOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);

    int updateOpeWarehouseReserve2(OpeWarehouseReserve opeWarehouseReserve);

    OpeWarehouseReserve getOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);

@@ -31,4 +36,14 @@
    void updateCount(Map<String ,Object> params);

    void insertOpeWarehouseReserve2(OpeWarehouseReserve ope);

    List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(Map params);

    List<OpeWarehouseReserve> selectWarehouseByRidAndArtiNumberAndWid(Map params);

    void updateBtReserve(String id, Integer useNum);

    Integer countByReagentId(String id);

    OpeWarehouseReserve getRowData(@Param("id") String rowKey);
}