申购管理申请履历显示所有历史单据，提交时如有无效试剂耗材报错

李宇

2021-08-18 c3510da29a7974c6af7ff3de1ade3db429d6f848

 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java

@@ -16,21 +16,40 @@
                                                         Integer pageSize);
   int getOpeWarehouseReserveTotalCount(String reagentId, String supplierId);
   List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first,
         Integer pageSize);
   int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId);
         Integer pageSize,String productSn,String warehouseName);
   int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn,String warehouseName);
   OpeWarehouseReserve getOpeWarehouseReserve(String reagentId, String articleNumber);
   OpeWarehouseReserve getOpeWarehouseReserve2(String reagentId, String articleNumber,String warehouseId);

   List<OpeWarehouseReserve> getOpeWarehouseReserveList(String reagentId, String articleNumber,String warehouseId);
   OpeWarehouseReserve getOpeWarehouseReserveBy(String reagentId, String articleNumber);

   OpeWarehouseReserve insertOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
   boolean updateOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
   void claim(List<OpeWarehouseReserve> selectedList, String userId,String projectNum);
   void claimForPerson(List<OpeApplyReserve> selectedListForPerson, String userId,String projectNum);
   void claimForPerson(List<OpeApplyReserve> selectedListForPerson, String userId,String projectNum,String laboratoryId,String laboratoryContainerId);
   void reagentDStore(List<OpeApply> reagentDStoreList, String loginUserId);
   void reagentDStore2(List<OpeApply> reagentDStoreList, String loginUserId);

   void reagentDStore3(List<OpeApply> reagentDStoreList, String loginUserId);

   void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId);

   public List<OpeWarehouseReserve> selectByReId(String id);
   public void updateByReId(String newReId,String oldReId);

   void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo);
   void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId);

   List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag);

   void btWarehouseReserveReduce(List<OpeApplyReserve> opeList);

   List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId);

   void updateBtReserve(String id,Integer useNum);

   //根据试剂Id查找当前库存
    int countByReagentId(String id);

    OpeWarehouseReserve getRowData(String rowKey);
}