Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

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

@@ -18,9 +18,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 +35,10 @@
    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);
}