Merge remote-tracking branch 'origin/master'

李宇

2021-02-04 1afdf3622484b9a54c4cc4642e38bbf5c815884f

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

@@ -16,8 +16,8 @@
                                                         Integer pageSize);
   int getOpeWarehouseReserveTotalCount(String reagentId, String supplierId);
   List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first,
         Integer pageSize,String productSn);
   int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn);
         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);

@@ -38,7 +38,7 @@
   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);