Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

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

@@ -38,15 +38,15 @@

   OpeUseFlow getOpeUseFlowByCode(String reagentCode);

    void updateReceiptNumber(String code, String receiptNumber);
    void updateReceiptNumber(String code, String receiptNumber,String note);

   void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber);
   void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber,String note);

   Map<String, Integer> getRegentInfoFromReceiptNumber(String receiptNumber);

   Map<String,String>  getApplyUserByReagentCode(String reagentCode);

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

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