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

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

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

@@ -1,6 +1,10 @@
package com.nanometer.smartlab.service;

import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.SysWarehouse;
import com.nanometer.smartlab.entity.dto.InWarehouseInfoDto;
import com.nanometer.smartlab.entity.dto.ReagentReceivingDto;
import com.nanometer.smartlab.entity.dto.SysWarehouseDto;

import java.util.List;

@@ -18,4 +22,11 @@
    public boolean deleteSysWarehouse(List<SysWarehouse> sysWarehouseList);
    public boolean isSysWarehouseExist(String barCode, String editId);

    List<SysWarehouseDto> getWarehouseList();

    void putInWarehouse(InWarehouseInfoDto inWarehouseInfo) throws Exception;

    void reagentReceiving(ReagentReceivingDto reagentReceiving);

    void updateSysWarehouse2(SysWarehouse sysWarehouse, SysLaboratory sysLaboratory);
}