Merge remote-tracking branch 'origin/master'

李宇

2021-02-04 1afdf3622484b9a54c4cc4642e38bbf5c815884f

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

@@ -38,11 +38,11 @@
   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,String userId);
   void btWarehouseReserveReduce(List<OpeApplyReserve> opeList);

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