Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

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

@@ -443,7 +443,7 @@
      }
   }

   public void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId){
   public void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId,String receiptNumber){
      if (reagentDStoreList == null) {
         return;
      }
@@ -518,6 +518,7 @@
               metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
               List<BaseMeta> baseMetaList2 = baseMetaDao.getBaseMetaList(metaMap2);
               ouf.setOperateState(baseMetaList2.get(0).getId());
               ouf.setReceiptNumber(receiptNumber);
               this.opeUseFlowService.insertOpeUseFlow(ouf);
            }
         }
@@ -668,7 +669,21 @@
      opeWarehouseReserveDao.updateBtReserve(id, useNum);
   }

   @Override
    @Override
    public int countByReagentId(String id) {
      int num = 0;
      if (opeWarehouseReserveDao.countByReagentId(id) != null) {
         num = opeWarehouseReserveDao.countByReagentId(id);
      }
      return num;
    }

    @Override
    public OpeWarehouseReserve getRowData(String rowKey) {
        return opeWarehouseReserveDao.getRowData(rowKey);
    }

    @Override
   public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList) {
      if (opeList.size() < 1) {
         return;