Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-06-16 b510b274d9003d0a643a43c1e01b1382d84f78ec

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

@@ -48,10 +48,15 @@

    void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber);

   int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project);
   int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName);

   List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, int first, int pageSize);
   List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName, int first, int pageSize);

    List<PersonUseDetail> getApplyInfo(String receiptNumber);

   int getApplyInfoSize(String receiptNumber);

    int getOpeUseFlow(OpeUseFlow opeUseFlow);

    void scrapReagent(String reagentId,String reagentCode, String userId);
}