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);
            }
         }