@ -862,7 +862,7 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
}
}
//所有有关分解的货道列表
//所有有关分解的货道列表
List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoriesByLayerNoAndMerge(inventory.getLayerNo(), inventory.getMerge());
List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoriesByLayerNoAndMerge(inventory.getIdDevice(),inventory.getLayerNo(), inventory.getMerge());