Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -574,17 +574,28 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        }
        if (isMerge) {
            Boolean isFirst = true;
            String wayerNos = "";
            for (String deviceId : cargoIds.split(",")) {
                if(!StringUtils.isEmpty(deviceId)){
                    MediicinecabinetInventory inventory = inventoryDao.findOne(deviceId);
                    if (StringUtils.isEmpty(wayerNos)) {
                        wayerNos += inventory.getWayerNo();
                    }else {
                        wayerNos += "," + inventory.getWayerNo();
                    }
                }
            }
            for (String deviceId : cargoIds.split(",")) {
                if(!StringUtils.isEmpty(deviceId)){
                    if (isFirst) {
                        MediicinecabinetInventory inventory = inventoryDao.findOne(deviceId);
                        inventory.setMerge(cargoIds);
                        inventory.setMerge(wayerNos);
                        inventory.setState("21");
                        inventoryDao.save(inventory);
                        isFirst = false;
                    } else {
                        MediicinecabinetInventory inventory = inventoryDao.findOne(deviceId);
                        inventory.setMerge(cargoIds);
                        inventory.setMerge(wayerNos);
                        inventory.setState("20");
                        inventoryDao.save(inventory);
                    }